From ddadbef425abf601d060ba6e9c60ee61a64af52a Mon Sep 17 00:00:00 2001 From: WayofTime Date: Sat, 14 Nov 2020 16:15:26 -0500 Subject: [PATCH] Added a bunch of the dungeon blocks to the mod. Mainly only the "Raw" variants right now. No recipes have been added yet. --- build.gradle | 2 +- src/generated/resources/.cache/cache | 106 ++++++++- .../blockstates/dungeon_brick1.json | 7 + .../blockstates/dungeon_brick2.json | 7 + .../blockstates/dungeon_brick3.json | 7 + .../blockstates/dungeon_brick_assorted.json | 15 ++ .../blockstates/dungeon_brick_gate.json | 80 +++++++ .../blockstates/dungeon_brick_stairs.json | 209 ++++++++++++++++++ .../blockstates/dungeon_brick_wall.json | 90 ++++++++ .../bloodmagic/blockstates/dungeon_eye.json | 7 + .../blockstates/dungeon_pillar_cap.json | 22 ++ .../blockstates/dungeon_pillar_center.json | 13 ++ .../blockstates/dungeon_pillar_special.json | 13 ++ .../blockstates/dungeon_polished.json | 7 + .../blockstates/dungeon_polished_gate.json | 80 +++++++ .../blockstates/dungeon_polished_stairs.json | 209 ++++++++++++++++++ .../blockstates/dungeon_polished_wall.json | 90 ++++++++ .../blockstates/dungeon_smallbrick.json | 7 + .../bloodmagic/blockstates/dungeon_stone.json | 20 ++ .../bloodmagic/blockstates/dungeon_tile.json | 7 + .../blockstates/dungeon_tilespecial.json | 7 + .../assets/bloodmagic/lang/en_us.json | 19 ++ .../models/block/dungeon_brick1.json | 6 + .../models/block/dungeon_brick2.json | 6 + .../models/block/dungeon_brick3.json | 6 + .../models/block/dungeon_brick_gate.json | 6 + .../models/block/dungeon_brick_gate_open.json | 6 + .../models/block/dungeon_brick_gate_wall.json | 6 + .../block/dungeon_brick_gate_wall_open.json | 6 + .../models/block/dungeon_brick_stairs.json | 8 + .../block/dungeon_brick_stairs_inner.json | 8 + .../block/dungeon_brick_stairs_outer.json | 8 + .../block/dungeon_brick_wall_inventory.json | 6 + .../models/block/dungeon_brick_wall_post.json | 6 + .../models/block/dungeon_brick_wall_side.json | 6 + .../block/dungeon_brick_wall_side_tall.json | 6 + .../bloodmagic/models/block/dungeon_eye.json | 6 + .../models/block/dungeon_pillar_cap.json | 8 + .../models/block/dungeon_pillar_cap_down.json | 8 + .../models/block/dungeon_pillar_cap_east.json | 59 +++++ .../block/dungeon_pillar_cap_north.json | 57 +++++ .../block/dungeon_pillar_cap_south.json | 57 +++++ .../models/block/dungeon_pillar_cap_west.json | 59 +++++ .../models/block/dungeon_pillar_center.json | 7 + .../models/block/dungeon_pillar_center_x.json | 58 +++++ .../models/block/dungeon_pillar_center_z.json | 56 +++++ .../models/block/dungeon_pillar_special.json | 7 + .../block/dungeon_pillar_special_x.json | 58 +++++ .../block/dungeon_pillar_special_z.json | 56 +++++ .../models/block/dungeon_polished.json | 6 + .../models/block/dungeon_polished_gate.json | 6 + .../block/dungeon_polished_gate_open.json | 6 + .../block/dungeon_polished_gate_wall.json | 6 + .../dungeon_polished_gate_wall_open.json | 6 + .../models/block/dungeon_polished_stairs.json | 8 + .../block/dungeon_polished_stairs_inner.json | 8 + .../block/dungeon_polished_stairs_outer.json | 8 + .../dungeon_polished_wall_inventory.json | 6 + .../block/dungeon_polished_wall_post.json | 6 + .../block/dungeon_polished_wall_side.json | 6 + .../dungeon_polished_wall_side_tall.json | 6 + .../models/block/dungeon_smallbrick.json | 6 + .../models/block/dungeon_stone.json | 6 + .../models/block/dungeon_stone_mirrored.json | 6 + .../bloodmagic/models/block/dungeon_tile.json | 6 + .../models/block/dungeon_tilespecial.json | 6 + .../models/item/dungeon_brick1.json | 3 + .../models/item/dungeon_brick2.json | 3 + .../models/item/dungeon_brick3.json | 3 + .../models/item/dungeon_brick_assorted.json | 3 + .../models/item/dungeon_brick_gate.json | 3 + .../models/item/dungeon_brick_stairs.json | 3 + .../models/item/dungeon_brick_wall.json | 3 + .../bloodmagic/models/item/dungeon_eye.json | 3 + .../models/item/dungeon_pillar_cap.json | 3 + .../models/item/dungeon_pillar_center.json | 3 + .../models/item/dungeon_pillar_special.json | 3 + .../models/item/dungeon_polished.json | 3 + .../models/item/dungeon_polished_gate.json | 3 + .../models/item/dungeon_polished_stairs.json | 3 + .../models/item/dungeon_polished_wall.json | 3 + .../models/item/dungeon_smallbrick.json | 3 + .../bloodmagic/models/item/dungeon_stone.json | 3 + .../bloodmagic/models/item/dungeon_tile.json | 3 + .../models/item/dungeon_tilespecial.json | 3 + .../recipes/bloodmagictab/ritual_reader.json | 32 +++ .../loot_tables/blocks/dungeon_brick1.json | 19 ++ .../loot_tables/blocks/dungeon_brick2.json | 19 ++ .../loot_tables/blocks/dungeon_brick3.json | 19 ++ .../blocks/dungeon_brick_assorted.json | 19 ++ .../blocks/dungeon_brick_gate.json | 19 ++ .../blocks/dungeon_brick_stairs.json | 19 ++ .../blocks/dungeon_brick_wall.json | 19 ++ .../loot_tables/blocks/dungeon_eye.json | 19 ++ .../blocks/dungeon_pillar_cap.json | 19 ++ .../blocks/dungeon_pillar_center.json | 19 ++ .../blocks/dungeon_pillar_special.json | 19 ++ .../loot_tables/blocks/dungeon_polished.json | 19 ++ .../blocks/dungeon_polished_gate.json | 19 ++ .../blocks/dungeon_polished_stairs.json | 19 ++ .../blocks/dungeon_polished_wall.json | 19 ++ .../blocks/dungeon_smallbrick.json | 19 ++ .../loot_tables/blocks/dungeon_stone.json | 19 ++ .../loot_tables/blocks/dungeon_tile.json | 19 ++ .../blocks/dungeon_tilespecial.json | 19 ++ .../bloodmagic/recipes/ritual_reader.json | 26 +++ .../data/minecraft/tags/blocks/walls.json | 7 + .../java/wayoftime/bloodmagic/BloodMagic.java | 1 + .../common/block/BloodMagicBlocks.java | 37 +++- .../common/block/base/BlockPillarCap.java | 58 +++++ .../common/data/GeneratorBlockStates.java | 168 ++++++++++++++ .../common/data/GeneratorBlockTags.java | 4 + .../common/data/GeneratorItemModels.java | 18 ++ .../common/data/GeneratorItemTags.java | 1 + .../common/data/GeneratorLanguage.java | 25 +++ .../common/data/GeneratorLootTable.java | 17 ++ .../common/item/BloodMagicItems.java | 21 ++ 117 files changed, 2547 insertions(+), 4 deletions(-) create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick1.json create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick2.json create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick3.json create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick_assorted.json create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick_gate.json create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick_stairs.json create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick_wall.json create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/dungeon_eye.json create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/dungeon_pillar_cap.json create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/dungeon_pillar_center.json create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/dungeon_pillar_special.json create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/dungeon_polished.json create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/dungeon_polished_gate.json create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/dungeon_polished_stairs.json create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/dungeon_polished_wall.json create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/dungeon_smallbrick.json create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/dungeon_stone.json create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/dungeon_tile.json create mode 100644 src/generated/resources/assets/bloodmagic/blockstates/dungeon_tilespecial.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_brick1.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_brick2.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_brick3.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_gate.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_gate_open.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_gate_wall.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_gate_wall_open.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_stairs.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_stairs_inner.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_stairs_outer.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_wall_inventory.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_wall_post.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_wall_side.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_wall_side_tall.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_eye.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_down.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_east.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_north.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_south.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_west.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_center.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_center_x.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_center_z.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_special.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_special_x.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_special_z.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_polished.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_gate.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_gate_open.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_gate_wall.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_gate_wall_open.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_stairs.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_stairs_inner.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_stairs_outer.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_wall_inventory.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_wall_post.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_wall_side.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_wall_side_tall.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_smallbrick.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_stone.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_stone_mirrored.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_tile.json create mode 100644 src/generated/resources/assets/bloodmagic/models/block/dungeon_tilespecial.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/dungeon_brick1.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/dungeon_brick2.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/dungeon_brick3.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/dungeon_brick_assorted.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/dungeon_brick_gate.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/dungeon_brick_stairs.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/dungeon_brick_wall.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/dungeon_eye.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/dungeon_pillar_cap.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/dungeon_pillar_center.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/dungeon_pillar_special.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/dungeon_polished.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/dungeon_polished_gate.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/dungeon_polished_stairs.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/dungeon_polished_wall.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/dungeon_smallbrick.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/dungeon_stone.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/dungeon_tile.json create mode 100644 src/generated/resources/assets/bloodmagic/models/item/dungeon_tilespecial.json create mode 100644 src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_reader.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick1.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick2.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick3.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick_assorted.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick_gate.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick_stairs.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick_wall.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_eye.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_pillar_cap.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_pillar_center.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_pillar_special.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_polished.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_polished_gate.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_polished_stairs.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_polished_wall.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_smallbrick.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_stone.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_tile.json create mode 100644 src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_tilespecial.json create mode 100644 src/generated/resources/data/bloodmagic/recipes/ritual_reader.json create mode 100644 src/generated/resources/data/minecraft/tags/blocks/walls.json create mode 100644 src/main/java/wayoftime/bloodmagic/common/block/base/BlockPillarCap.java diff --git a/build.gradle b/build.gradle index 084222a9..99fc2dc7 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ apply plugin: 'net.minecraftforge.gradle' apply plugin: 'eclipse' apply plugin: 'maven-publish' -version = '1.16.3-3.0.0-3' +version = '1.16.3-3.0.0-4' group = 'com.yourname.modid' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = 'BloodMagic' diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index e4d171a6..5226c4f5 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -10,6 +10,25 @@ cb435652c27b4978d8db83af2fd531ccaa82ada7 assets/bloodmagic/blockstates/accelerat a35188b0244bf9808098c7d49d0af9bd32cef297 assets/bloodmagic/blockstates/corrosivedemoncrystal.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 +79853c0ffa8fd2eb9e2ddd0848c572de0cf49037 assets/bloodmagic/blockstates/dungeon_brick3.json +1117fb4dd4f110a7b7fabae92760e0a3b949c461 assets/bloodmagic/blockstates/dungeon_brick_assorted.json +c67498a81f8dd53770da51df45192b171cdd234c assets/bloodmagic/blockstates/dungeon_brick_gate.json +8b568926830785a5cb848fb36d4ae01e67590501 assets/bloodmagic/blockstates/dungeon_brick_stairs.json +6c10c79909e008b960f2d78543f55847eec7a226 assets/bloodmagic/blockstates/dungeon_brick_wall.json +8a04e502b6965d912793699d61071e44428fceb8 assets/bloodmagic/blockstates/dungeon_eye.json +388af5c6d34f62d66d987760871c64793df84a37 assets/bloodmagic/blockstates/dungeon_pillar_cap.json +8d8d58ad890f339b75dbdfc710b30dc00eed2ef3 assets/bloodmagic/blockstates/dungeon_pillar_center.json +48e7b0533fa722eb66956e01de661ebac6470da7 assets/bloodmagic/blockstates/dungeon_pillar_special.json +e3f31a23580bce835115483f5790cb08bac44fe2 assets/bloodmagic/blockstates/dungeon_polished.json +aa980029d03236ba34f53952fdadc06cf1cff245 assets/bloodmagic/blockstates/dungeon_polished_gate.json +30c3dc138436c2a25a7fcdd7edca7f70f1adb425 assets/bloodmagic/blockstates/dungeon_polished_stairs.json +512bd11d55934229cb464c720362949302309eba assets/bloodmagic/blockstates/dungeon_polished_wall.json +2015a403ca2bcc73afbb4768df99554a13b171b6 assets/bloodmagic/blockstates/dungeon_smallbrick.json +f5b4cda776f7aabe537ca843e41074c03429cdfb assets/bloodmagic/blockstates/dungeon_stone.json +167512323d506489adb4487d3da092ceec0bd17e assets/bloodmagic/blockstates/dungeon_tile.json +4806276351c534917c2e72f98c4618e6592b18a0 assets/bloodmagic/blockstates/dungeon_tilespecial.json ba1cd8a9475212843e3b26232c8a9943fa0d2d20 assets/bloodmagic/blockstates/duskritualstone.json bb3db171734f511fc0c259d86e869b49aa1d0c77 assets/bloodmagic/blockstates/earthritualstone.json e780d6d9e891082dc6ce83fde1697ce36281a02a assets/bloodmagic/blockstates/fireritualstone.json @@ -33,7 +52,7 @@ e6d9cf699667aaa47efff37b2b033895dee29c15 assets/bloodmagic/blockstates/waterritu 42f26f715bddd16c069f9b51e3767b36477c8908 assets/bloodmagic/blockstates/woodtilepath.json 3c6ce233dae6c1307d9016406c324bbe844b4e1e assets/bloodmagic/blockstates/wornstonebrickpath.json d59655f12d1724b73b77c373fb6864fcff69db12 assets/bloodmagic/blockstates/wornstonetilepath.json -59b1ed6c18916f66576dd584ca3d1a203aa6fd87 assets/bloodmagic/lang/en_us.json +d3b0f3df0b83423d59343a185b28f6de543b64bb 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 @@ -79,6 +98,50 @@ fe8271e4e815de11cd617179dedface57bd8c696 assets/bloodmagic/models/block/crystal/ 9603b46cb4ebc567878ca5f54fe96e1199f34d0c assets/bloodmagic/models/block/crystal/vengefulcrystal6.json ecf64f8c06743f0c2752e32a67753c0d5f9f67a1 assets/bloodmagic/models/block/crystal/vengefulcrystal7.json 6adbeedc17f649ef47419845a6da0d50cfc76742 assets/bloodmagic/models/block/dislocationrune.json +313607b36c7c30073bbc64d3130f15b5871c5cd3 assets/bloodmagic/models/block/dungeon_brick1.json +55a9c171872cf9fb40c06dc2e9e826223a9096e0 assets/bloodmagic/models/block/dungeon_brick2.json +ff6727ee9a149e89deef8d666f373bdb4e68a545 assets/bloodmagic/models/block/dungeon_brick3.json +5b95b5519b04dec4f87ad7d287e3e1fa344725d8 assets/bloodmagic/models/block/dungeon_brick_gate.json +3de5c424b0928c220bf2073ee6aca5dbf4f379bb assets/bloodmagic/models/block/dungeon_brick_gate_open.json +daaeb0a0adb39fb6df3c6e6d380b34efd14bf4ce assets/bloodmagic/models/block/dungeon_brick_gate_wall.json +62ecdb415d060bf8a815f57fcf4c56b1e788f8f2 assets/bloodmagic/models/block/dungeon_brick_gate_wall_open.json +d40eb07dfa8b700d08a7f4c3739f4b6eef0bc95f assets/bloodmagic/models/block/dungeon_brick_stairs.json +df27c2b4e3345199ba29e16cddffcb86efe457b5 assets/bloodmagic/models/block/dungeon_brick_stairs_inner.json +2fbb36a96684b4acc57e551ac1f971878685a2aa assets/bloodmagic/models/block/dungeon_brick_stairs_outer.json +ffb2021036b74d29fca5fc706885f3e1399c2950 assets/bloodmagic/models/block/dungeon_brick_wall_inventory.json +70508a960748a3f62a11b1a7277977f0256be58a assets/bloodmagic/models/block/dungeon_brick_wall_post.json +a7d371e5d0efefae2729131bda16120bfe477bb8 assets/bloodmagic/models/block/dungeon_brick_wall_side.json +bd152efd619489661cac86a80190bf9e88c86363 assets/bloodmagic/models/block/dungeon_brick_wall_side_tall.json +19ae530a34eb5cee35dc7b9cdd51c9c2d61fdc9e assets/bloodmagic/models/block/dungeon_eye.json +a4449c1d14c46bcda58b542c3efdddadff15bedc assets/bloodmagic/models/block/dungeon_pillar_cap.json +1752cc99d0c334016bebd0e8027b8abe3ca5d7e8 assets/bloodmagic/models/block/dungeon_pillar_cap_down.json +f171162bb4b86e70f2b2f13f3393704d295a4d86 assets/bloodmagic/models/block/dungeon_pillar_cap_east.json +c340c5e6c593cec4d342b36097fe7cca85ad647b assets/bloodmagic/models/block/dungeon_pillar_cap_north.json +c8ee14fcf2f46c755b47cc407e3cd0dbe7a477f9 assets/bloodmagic/models/block/dungeon_pillar_cap_south.json +4ac68eafddb0c99ad884af596bc48cd63af5a021 assets/bloodmagic/models/block/dungeon_pillar_cap_west.json +e6f858e8aa3c4bf2189885400a76892e707f5403 assets/bloodmagic/models/block/dungeon_pillar_center.json +12209619fc1d437d9339402ce437e6c9b2f3c02b assets/bloodmagic/models/block/dungeon_pillar_center_x.json +a4223ff2570f04a4a5d068944e8964811a62e92a assets/bloodmagic/models/block/dungeon_pillar_center_z.json +5b884f4ad41e9f0ba94a1a91938af497d3dde49b assets/bloodmagic/models/block/dungeon_pillar_special.json +eb4237db6507002305969c55ba64c9e19fe90357 assets/bloodmagic/models/block/dungeon_pillar_special_x.json +29736a69c3d5eef5b11befa0be27ddd274abc29e assets/bloodmagic/models/block/dungeon_pillar_special_z.json +a0aabc2be78af27e620e82d9f9b877dc99ae2798 assets/bloodmagic/models/block/dungeon_polished.json +05b4a25735c96036005bea06e013651a8aac5641 assets/bloodmagic/models/block/dungeon_polished_gate.json +fd32ed9981b8164f88319b66811f8e6d41ec8470 assets/bloodmagic/models/block/dungeon_polished_gate_open.json +590dbd87da39d8dc0f03dd274e46e5fec55a6ab0 assets/bloodmagic/models/block/dungeon_polished_gate_wall.json +9b86f7cfcf9b539090a49fe213ca76eb4295a7cd assets/bloodmagic/models/block/dungeon_polished_gate_wall_open.json +a9871493a35453a0f0cf1f5ff3e54f646325c2cf assets/bloodmagic/models/block/dungeon_polished_stairs.json +b073d62667acc4d278b96efcfbb929e4c70afe22 assets/bloodmagic/models/block/dungeon_polished_stairs_inner.json +fc4b1f91035eab88ea3178713ff950dce2637e41 assets/bloodmagic/models/block/dungeon_polished_stairs_outer.json +f5176982c9143ec07275349178617102af40ebeb assets/bloodmagic/models/block/dungeon_polished_wall_inventory.json +eb1252284b87f352e5d7eeae48d57e189f25340f assets/bloodmagic/models/block/dungeon_polished_wall_post.json +3c060012163a8c95532b85010773326a28e6f30e assets/bloodmagic/models/block/dungeon_polished_wall_side.json +6b5d875b69643f9daa4302a317ef3863fcce1a91 assets/bloodmagic/models/block/dungeon_polished_wall_side_tall.json +ef2a677751c2ae6c3cec9b905c28aeb615ea03e7 assets/bloodmagic/models/block/dungeon_smallbrick.json +84555e144215de4477ab826420400747b11edf9a assets/bloodmagic/models/block/dungeon_stone.json +d4e4cbb3a24e069a8e6c8e60764f8bbb7b3adb2b assets/bloodmagic/models/block/dungeon_stone_mirrored.json +8a922c0105191857905467f048aa40221cb34853 assets/bloodmagic/models/block/dungeon_tile.json +3895234c0c49d936ad0ad420dedd3669999b8a81 assets/bloodmagic/models/block/dungeon_tilespecial.json 81313327125e6e7396df0408595228bf0f63e1c9 assets/bloodmagic/models/block/duskritualstone.json c30064f4aa09c42d23e94d118ae5b148eadb3a6c assets/bloodmagic/models/block/earthritualstone.json 4ff1cab1014cd8f655e5f032ecf60dd371f421c3 assets/bloodmagic/models/block/fireritualstone.json @@ -134,6 +197,25 @@ a61193ff59b71a79e8e28720dfce4185122a7ec1 assets/bloodmagic/models/item/destructi 3e952fc5e87bd7883dadd761ef708ddfac29638c assets/bloodmagic/models/item/destructivedemoncrystal.json 7af07ab578bbd20e2f834b26d9cafb5fe23bc7d4 assets/bloodmagic/models/item/dislocationrune.json f4531e22aa1db1cff324db5ccb344d3b9fa85c8d assets/bloodmagic/models/item/divinationsigil.json +f866879eed9f1bd7eebac14495de599ca3ad855d assets/bloodmagic/models/item/dungeon_brick1.json +78f206d696acf10f082a34c7ec2fdbddc321231a assets/bloodmagic/models/item/dungeon_brick2.json +52f18a291e92fe5218dd4abacdabdc106dc2d380 assets/bloodmagic/models/item/dungeon_brick3.json +f866879eed9f1bd7eebac14495de599ca3ad855d assets/bloodmagic/models/item/dungeon_brick_assorted.json +1a1ab86e948d6f2a7e928750d5442fff1edb4c19 assets/bloodmagic/models/item/dungeon_brick_gate.json +2ec6a2c66e88981ff54e74035bb3adb1ec4f6396 assets/bloodmagic/models/item/dungeon_brick_stairs.json +098a26f4e9222c801f9a17a6db1b266ad4085003 assets/bloodmagic/models/item/dungeon_brick_wall.json +0a48c4fd74036702ae2d72a9b2333c2bdf5ab31b assets/bloodmagic/models/item/dungeon_eye.json +ba5c610437b7d3a84820109c32d204310ff41fd7 assets/bloodmagic/models/item/dungeon_pillar_cap.json +d098a544e7b9918a45106c2cbc5e10baea66502a assets/bloodmagic/models/item/dungeon_pillar_center.json +5284f1cc7508546c66669564182fe5056053333d assets/bloodmagic/models/item/dungeon_pillar_special.json +9e876e438fa9bac067f6b3af4904e6bbd24044c8 assets/bloodmagic/models/item/dungeon_polished.json +9a7bf4c6c15f2a6e39588b1b8aed7988a7713a02 assets/bloodmagic/models/item/dungeon_polished_gate.json +477cd98babad0a71ccfcc9e541169fe9bc31d8d1 assets/bloodmagic/models/item/dungeon_polished_stairs.json +f3b763d6edc3c75655797481f05e02d409f481d9 assets/bloodmagic/models/item/dungeon_polished_wall.json +2ecba4811bd02698f6a34b5cdd9160426f7bda63 assets/bloodmagic/models/item/dungeon_smallbrick.json +2d7a8a3ed9f91a5bf5c277c6342c69e97692d347 assets/bloodmagic/models/item/dungeon_stone.json +6186d2045f87b1e6cc7006226993a93b63d650ff assets/bloodmagic/models/item/dungeon_tile.json +21e8a4fa93ba249684e0624a10a6f0f00ff6d194 assets/bloodmagic/models/item/dungeon_tilespecial.json 10aceefca3ad3f0da773cb317c4effc6c06051ea assets/bloodmagic/models/item/duskritualstone.json 5783901af844ab0a741958dbe684d668a9c293c4 assets/bloodmagic/models/item/duskscribetool.json 4d56efd7fdbf430f49903ce201577047687c3804 assets/bloodmagic/models/item/earthritualstone.json @@ -298,6 +380,7 @@ ea0b32b5595661f0d09f68a8a596577cc62ba0b1 data/bloodmagic/advancements/recipes/bl 7cf09fef1a5bfc1401ecc34857bdf78c7282c12a data/bloodmagic/advancements/recipes/bloodmagictab/primitive_hydration_cell.json 01e90bb9c59d44a52777ecc0cf28754295fda675 data/bloodmagic/advancements/recipes/bloodmagictab/ritual_diviner_0.json 836e1fc171dba197e02d6a9e3e61a3718cb5a482 data/bloodmagic/advancements/recipes/bloodmagictab/ritual_diviner_1.json +5deb91599f19a4f28e5b03c9fcb428d3f00a3644 data/bloodmagic/advancements/recipes/bloodmagictab/ritual_reader.json c8e5cdac0e7328640ab1cb0eab0a46f0733b59b3 data/bloodmagic/advancements/recipes/bloodmagictab/ritual_stone_blank.json 1578416eb302aecb3fd61e481634c5c021541f51 data/bloodmagic/advancements/recipes/bloodmagictab/ritual_stone_master.json 832301a424345b7ca70b43cb214faa104179f0fb data/bloodmagic/advancements/recipes/bloodmagictab/sacrificial_dagger.json @@ -322,6 +405,25 @@ f0827ad5bf71c06a71f50aeb0298c04d0cb1a1d9 data/bloodmagic/loot_tables/blocks/bloo c590b923d28b3d7916932dfcb05091df815f71dd data/bloodmagic/loot_tables/blocks/demoncrystallizer.json b0ce964c69f63aa13350259279e5fe831ae18e2c data/bloodmagic/loot_tables/blocks/destructivedemoncrystal.json a9fcfc656fab957328c10ee1d9d33807e697b7f7 data/bloodmagic/loot_tables/blocks/dislocationrune.json +e39c50638d466bf706327f52fd42c915e2990d7e data/bloodmagic/loot_tables/blocks/dungeon_brick1.json +be050ff812ae62793e3c51d7c2ab343294ede7f0 data/bloodmagic/loot_tables/blocks/dungeon_brick2.json +75252b630d7e0cf77db12125844283949ee94226 data/bloodmagic/loot_tables/blocks/dungeon_brick3.json +607d6e286ff2280686f258a931341aeed5334781 data/bloodmagic/loot_tables/blocks/dungeon_brick_assorted.json +03410080009911badbf6458a54b596bee464cbe4 data/bloodmagic/loot_tables/blocks/dungeon_brick_gate.json +0d30aeb91425e2419abf555e9baab34475f45afc data/bloodmagic/loot_tables/blocks/dungeon_brick_stairs.json +fa335aded871280065ca02db79d6de59ced7f6c9 data/bloodmagic/loot_tables/blocks/dungeon_brick_wall.json +47baa958866616d96eb39e2671a4cf488e0abae2 data/bloodmagic/loot_tables/blocks/dungeon_eye.json +53864c213b973e67006cda4596877bcdd3474396 data/bloodmagic/loot_tables/blocks/dungeon_pillar_cap.json +db8be3b67639ab451d0a28e0674240094ceea046 data/bloodmagic/loot_tables/blocks/dungeon_pillar_center.json +c3deab4dd4ef8c1cf6f217d660ea07e5d7bd8555 data/bloodmagic/loot_tables/blocks/dungeon_pillar_special.json +32d9f0674d7d416a5d668af187b89caede4188a3 data/bloodmagic/loot_tables/blocks/dungeon_polished.json +dc0822572a66634163dd630797b1b90d98d47c22 data/bloodmagic/loot_tables/blocks/dungeon_polished_gate.json +a44e605af1925a17a806c751f9f4279dbffa417f data/bloodmagic/loot_tables/blocks/dungeon_polished_stairs.json +d6f0610c923131dee1c8723231ffafd7a75eb689 data/bloodmagic/loot_tables/blocks/dungeon_polished_wall.json +e936d89fc5a75a786a455a32e9bce2f7b1bdcb34 data/bloodmagic/loot_tables/blocks/dungeon_smallbrick.json +b6732b30df9e946739a1913671a60f56090679f8 data/bloodmagic/loot_tables/blocks/dungeon_stone.json +69eb25424b97782eb86d9667581ada8d03e3b220 data/bloodmagic/loot_tables/blocks/dungeon_tile.json +6381473b6e0bc7c16b8214eb083f5069622b4dd1 data/bloodmagic/loot_tables/blocks/dungeon_tilespecial.json 26e3f34021426def32602e5ae7755e4672878320 data/bloodmagic/loot_tables/blocks/duskritualstone.json 26e3f34021426def32602e5ae7755e4672878320 data/bloodmagic/loot_tables/blocks/earthritualstone.json 26e3f34021426def32602e5ae7755e4672878320 data/bloodmagic/loot_tables/blocks/fireritualstone.json @@ -435,6 +537,7 @@ d85f637e3c87ba050c24581b8f4bef4176e1ba14 data/bloodmagic/recipes/path/path_worns 7e1a70935e9b5ba6b345af6a7077287896ec6cfe data/bloodmagic/recipes/primitive_hydration_cell.json bfd7925ad30534463d7daf0f7dce03cf1502cbcf data/bloodmagic/recipes/ritual_diviner_0.json 2ec436681cdd169bae99d090bb889c2a45420b6c data/bloodmagic/recipes/ritual_diviner_1.json +18accae45d6c592b108c227c629caf15e430bf2b data/bloodmagic/recipes/ritual_reader.json 7757e5fd52f71b0d21595e072593fc592210dd64 data/bloodmagic/recipes/ritual_stone_blank.json 8608f828f997b1a8015287bd9cd436e9d7dff2ff data/bloodmagic/recipes/ritual_stone_master.json aefbf1fd258f1cda8d04db7e0794b9612993e6bf data/bloodmagic/recipes/sacrificial_dagger.json @@ -493,3 +596,4 @@ af9b1a9ba1b16a85e3e1cf84b99e4cc9e12f9886 data/bloodmagic/tags/items/gravels/gold 74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/forge/tags/items/ores/osmium.json 74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/forge/tags/items/ores/silver.json 74700d556ca80c7a1db5fd4efb09c3ddb26cad66 data/forge/tags/items/ores/tin.json +2ba6f93ee0567360afa3ae9999027b839ed06532 data/minecraft/tags/blocks/walls.json diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick1.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick1.json new file mode 100644 index 00000000..149337cf --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick1.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "bloodmagic:block/dungeon_brick1" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick2.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick2.json new file mode 100644 index 00000000..2be23091 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick2.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "bloodmagic:block/dungeon_brick2" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick3.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick3.json new file mode 100644 index 00000000..b5c84c5c --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick3.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "bloodmagic:block/dungeon_brick3" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick_assorted.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick_assorted.json new file mode 100644 index 00000000..81dc572a --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick_assorted.json @@ -0,0 +1,15 @@ +{ + "variants": { + "": [ + { + "model": "bloodmagic:block/dungeon_brick1" + }, + { + "model": "bloodmagic:block/dungeon_brick2" + }, + { + "model": "bloodmagic:block/dungeon_brick3" + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick_gate.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick_gate.json new file mode 100644 index 00000000..4dae3f78 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick_gate.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,in_wall=false,open=false": { + "model": "bloodmagic:block/dungeon_brick_gate", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=false": { + "model": "bloodmagic:block/dungeon_brick_gate", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "bloodmagic:block/dungeon_brick_gate", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=false": { + "model": "bloodmagic:block/dungeon_brick_gate", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=false": { + "model": "bloodmagic:block/dungeon_brick_gate_wall", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "bloodmagic:block/dungeon_brick_gate_wall", + "uvlock": true + }, + "facing=west,in_wall=true,open=false": { + "model": "bloodmagic:block/dungeon_brick_gate_wall", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=false": { + "model": "bloodmagic:block/dungeon_brick_gate_wall", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=false,open=true": { + "model": "bloodmagic:block/dungeon_brick_gate_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "bloodmagic:block/dungeon_brick_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=true": { + "model": "bloodmagic:block/dungeon_brick_gate_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=true": { + "model": "bloodmagic:block/dungeon_brick_gate_open", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=true": { + "model": "bloodmagic:block/dungeon_brick_gate_wall_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "bloodmagic:block/dungeon_brick_gate_wall_open", + "uvlock": true + }, + "facing=west,in_wall=true,open=true": { + "model": "bloodmagic:block/dungeon_brick_gate_wall_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=true": { + "model": "bloodmagic:block/dungeon_brick_gate_wall_open", + "y": 270, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick_stairs.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick_stairs.json new file mode 100644 index 00000000..f36609c1 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "bloodmagic:block/dungeon_brick_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "bloodmagic:block/dungeon_brick_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "bloodmagic:block/dungeon_brick_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "bloodmagic:block/dungeon_brick_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "bloodmagic:block/dungeon_brick_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "bloodmagic:block/dungeon_brick_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "bloodmagic:block/dungeon_brick_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "bloodmagic:block/dungeon_brick_stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "bloodmagic:block/dungeon_brick_stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "bloodmagic:block/dungeon_brick_stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "bloodmagic:block/dungeon_brick_stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "bloodmagic:block/dungeon_brick_stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "bloodmagic:block/dungeon_brick_stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "bloodmagic:block/dungeon_brick_stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "bloodmagic:block/dungeon_brick_stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "bloodmagic:block/dungeon_brick_stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "bloodmagic:block/dungeon_brick_stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "bloodmagic:block/dungeon_brick_stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "bloodmagic:block/dungeon_brick_stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "bloodmagic:block/dungeon_brick_stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "bloodmagic:block/dungeon_brick_stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "bloodmagic:block/dungeon_brick_stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "bloodmagic:block/dungeon_brick_stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "bloodmagic:block/dungeon_brick_stairs_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "bloodmagic:block/dungeon_brick_stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "bloodmagic:block/dungeon_brick_stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "bloodmagic:block/dungeon_brick_stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "bloodmagic:block/dungeon_brick_stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "bloodmagic:block/dungeon_brick_stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "bloodmagic:block/dungeon_brick_stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "bloodmagic:block/dungeon_brick_stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "bloodmagic:block/dungeon_brick_stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "bloodmagic:block/dungeon_brick_stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "bloodmagic:block/dungeon_brick_stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "bloodmagic:block/dungeon_brick_stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "bloodmagic:block/dungeon_brick_stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "bloodmagic:block/dungeon_brick_stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "bloodmagic:block/dungeon_brick_stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "bloodmagic:block/dungeon_brick_stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "bloodmagic:block/dungeon_brick_stairs_outer" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick_wall.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick_wall.json new file mode 100644 index 00000000..9ffbb2d4 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_brick_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "bloodmagic:block/dungeon_brick_wall_post" + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "bloodmagic:block/dungeon_brick_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "bloodmagic:block/dungeon_brick_wall_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "north": "low" + }, + "apply": { + "model": "bloodmagic:block/dungeon_brick_wall_side", + "uvlock": true + } + }, + { + "when": { + "north": "tall" + }, + "apply": { + "model": "bloodmagic:block/dungeon_brick_wall_side_tall", + "uvlock": true + } + }, + { + "when": { + "south": "low" + }, + "apply": { + "model": "bloodmagic:block/dungeon_brick_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "south": "tall" + }, + "apply": { + "model": "bloodmagic:block/dungeon_brick_wall_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" + }, + "apply": { + "model": "bloodmagic:block/dungeon_brick_wall_side", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "west": "tall" + }, + "apply": { + "model": "bloodmagic:block/dungeon_brick_wall_side_tall", + "y": 270, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_eye.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_eye.json new file mode 100644 index 00000000..baa1f6ce --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_eye.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "bloodmagic:block/dungeon_eye" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_pillar_cap.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_pillar_cap.json new file mode 100644 index 00000000..cc2654a2 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_pillar_cap.json @@ -0,0 +1,22 @@ +{ + "variants": { + "facing=down": { + "model": "bloodmagic:block/dungeon_pillar_cap_down" + }, + "facing=up": { + "model": "bloodmagic:block/dungeon_pillar_cap" + }, + "facing=north": { + "model": "bloodmagic:block/dungeon_pillar_cap_north" + }, + "facing=south": { + "model": "bloodmagic:block/dungeon_pillar_cap_south" + }, + "facing=west": { + "model": "bloodmagic:block/dungeon_pillar_cap_west" + }, + "facing=east": { + "model": "bloodmagic:block/dungeon_pillar_cap_east" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_pillar_center.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_pillar_center.json new file mode 100644 index 00000000..56d64ff0 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_pillar_center.json @@ -0,0 +1,13 @@ +{ + "variants": { + "axis=x": { + "model": "bloodmagic:block/dungeon_pillar_center_x" + }, + "axis=y": { + "model": "bloodmagic:block/dungeon_pillar_center" + }, + "axis=z": { + "model": "bloodmagic:block/dungeon_pillar_center_z" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_pillar_special.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_pillar_special.json new file mode 100644 index 00000000..6b7e479d --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_pillar_special.json @@ -0,0 +1,13 @@ +{ + "variants": { + "axis=x": { + "model": "bloodmagic:block/dungeon_pillar_special_x" + }, + "axis=y": { + "model": "bloodmagic:block/dungeon_pillar_special" + }, + "axis=z": { + "model": "bloodmagic:block/dungeon_pillar_special_z" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_polished.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_polished.json new file mode 100644 index 00000000..0a334ab3 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_polished.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "bloodmagic:block/dungeon_polished" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_polished_gate.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_polished_gate.json new file mode 100644 index 00000000..467dc35d --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_polished_gate.json @@ -0,0 +1,80 @@ +{ + "variants": { + "facing=north,in_wall=false,open=false": { + "model": "bloodmagic:block/dungeon_polished_gate", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=false": { + "model": "bloodmagic:block/dungeon_polished_gate", + "uvlock": true + }, + "facing=west,in_wall=false,open=false": { + "model": "bloodmagic:block/dungeon_polished_gate", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=false": { + "model": "bloodmagic:block/dungeon_polished_gate", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=false": { + "model": "bloodmagic:block/dungeon_polished_gate_wall", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=false": { + "model": "bloodmagic:block/dungeon_polished_gate_wall", + "uvlock": true + }, + "facing=west,in_wall=true,open=false": { + "model": "bloodmagic:block/dungeon_polished_gate_wall", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=false": { + "model": "bloodmagic:block/dungeon_polished_gate_wall", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=false,open=true": { + "model": "bloodmagic:block/dungeon_polished_gate_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=false,open=true": { + "model": "bloodmagic:block/dungeon_polished_gate_open", + "uvlock": true + }, + "facing=west,in_wall=false,open=true": { + "model": "bloodmagic:block/dungeon_polished_gate_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=false,open=true": { + "model": "bloodmagic:block/dungeon_polished_gate_open", + "y": 270, + "uvlock": true + }, + "facing=north,in_wall=true,open=true": { + "model": "bloodmagic:block/dungeon_polished_gate_wall_open", + "y": 180, + "uvlock": true + }, + "facing=south,in_wall=true,open=true": { + "model": "bloodmagic:block/dungeon_polished_gate_wall_open", + "uvlock": true + }, + "facing=west,in_wall=true,open=true": { + "model": "bloodmagic:block/dungeon_polished_gate_wall_open", + "y": 90, + "uvlock": true + }, + "facing=east,in_wall=true,open=true": { + "model": "bloodmagic:block/dungeon_polished_gate_wall_open", + "y": 270, + "uvlock": true + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_polished_stairs.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_polished_stairs.json new file mode 100644 index 00000000..0b576e77 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_polished_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=north,half=top,shape=straight": { + "model": "bloodmagic:block/dungeon_polished_stairs", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=straight": { + "model": "bloodmagic:block/dungeon_polished_stairs", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=straight": { + "model": "bloodmagic:block/dungeon_polished_stairs", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=straight": { + "model": "bloodmagic:block/dungeon_polished_stairs", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=straight": { + "model": "bloodmagic:block/dungeon_polished_stairs", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=straight": { + "model": "bloodmagic:block/dungeon_polished_stairs", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=straight": { + "model": "bloodmagic:block/dungeon_polished_stairs", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=straight": { + "model": "bloodmagic:block/dungeon_polished_stairs" + }, + "facing=north,half=top,shape=inner_left": { + "model": "bloodmagic:block/dungeon_polished_stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=inner_left": { + "model": "bloodmagic:block/dungeon_polished_stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=inner_left": { + "model": "bloodmagic:block/dungeon_polished_stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=inner_left": { + "model": "bloodmagic:block/dungeon_polished_stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "bloodmagic:block/dungeon_polished_stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "bloodmagic:block/dungeon_polished_stairs_inner" + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "bloodmagic:block/dungeon_polished_stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_left": { + "model": "bloodmagic:block/dungeon_polished_stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=inner_right": { + "model": "bloodmagic:block/dungeon_polished_stairs_inner", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=inner_right": { + "model": "bloodmagic:block/dungeon_polished_stairs_inner", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=inner_right": { + "model": "bloodmagic:block/dungeon_polished_stairs_inner", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=inner_right": { + "model": "bloodmagic:block/dungeon_polished_stairs_inner", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "bloodmagic:block/dungeon_polished_stairs_inner", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "bloodmagic:block/dungeon_polished_stairs_inner", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "bloodmagic:block/dungeon_polished_stairs_inner", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "bloodmagic:block/dungeon_polished_stairs_inner" + }, + "facing=north,half=top,shape=outer_left": { + "model": "bloodmagic:block/dungeon_polished_stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=south,half=top,shape=outer_left": { + "model": "bloodmagic:block/dungeon_polished_stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=west,half=top,shape=outer_left": { + "model": "bloodmagic:block/dungeon_polished_stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=east,half=top,shape=outer_left": { + "model": "bloodmagic:block/dungeon_polished_stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "bloodmagic:block/dungeon_polished_stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "bloodmagic:block/dungeon_polished_stairs_outer" + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "bloodmagic:block/dungeon_polished_stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "bloodmagic:block/dungeon_polished_stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=north,half=top,shape=outer_right": { + "model": "bloodmagic:block/dungeon_polished_stairs_outer", + "x": 180, + "uvlock": true + }, + "facing=south,half=top,shape=outer_right": { + "model": "bloodmagic:block/dungeon_polished_stairs_outer", + "x": 180, + "y": 180, + "uvlock": true + }, + "facing=west,half=top,shape=outer_right": { + "model": "bloodmagic:block/dungeon_polished_stairs_outer", + "x": 180, + "y": 270, + "uvlock": true + }, + "facing=east,half=top,shape=outer_right": { + "model": "bloodmagic:block/dungeon_polished_stairs_outer", + "x": 180, + "y": 90, + "uvlock": true + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "bloodmagic:block/dungeon_polished_stairs_outer", + "y": 270, + "uvlock": true + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "bloodmagic:block/dungeon_polished_stairs_outer", + "y": 90, + "uvlock": true + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "bloodmagic:block/dungeon_polished_stairs_outer", + "y": 180, + "uvlock": true + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "bloodmagic:block/dungeon_polished_stairs_outer" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_polished_wall.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_polished_wall.json new file mode 100644 index 00000000..228f6735 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_polished_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "bloodmagic:block/dungeon_polished_wall_post" + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "bloodmagic:block/dungeon_polished_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "bloodmagic:block/dungeon_polished_wall_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "north": "low" + }, + "apply": { + "model": "bloodmagic:block/dungeon_polished_wall_side", + "uvlock": true + } + }, + { + "when": { + "north": "tall" + }, + "apply": { + "model": "bloodmagic:block/dungeon_polished_wall_side_tall", + "uvlock": true + } + }, + { + "when": { + "south": "low" + }, + "apply": { + "model": "bloodmagic:block/dungeon_polished_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "south": "tall" + }, + "apply": { + "model": "bloodmagic:block/dungeon_polished_wall_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" + }, + "apply": { + "model": "bloodmagic:block/dungeon_polished_wall_side", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "west": "tall" + }, + "apply": { + "model": "bloodmagic:block/dungeon_polished_wall_side_tall", + "y": 270, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_smallbrick.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_smallbrick.json new file mode 100644 index 00000000..c9950639 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_smallbrick.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "bloodmagic:block/dungeon_smallbrick" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_stone.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_stone.json new file mode 100644 index 00000000..7e4a6bec --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_stone.json @@ -0,0 +1,20 @@ +{ + "variants": { + "": [ + { + "model": "bloodmagic:block/dungeon_stone" + }, + { + "model": "bloodmagic:block/dungeon_stone_mirrored" + }, + { + "model": "bloodmagic:block/dungeon_stone", + "y": 180 + }, + { + "model": "bloodmagic:block/dungeon_stone_mirrored", + "y": 180 + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_tile.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_tile.json new file mode 100644 index 00000000..c34e5e71 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_tile.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "bloodmagic:block/dungeon_tile" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/blockstates/dungeon_tilespecial.json b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_tilespecial.json new file mode 100644 index 00000000..1204cd1d --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/blockstates/dungeon_tilespecial.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "bloodmagic:block/dungeon_tilespecial" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/lang/en_us.json b/src/generated/resources/assets/bloodmagic/lang/en_us.json index b980958e..e6065ae3 100644 --- a/src/generated/resources/assets/bloodmagic/lang/en_us.json +++ b/src/generated/resources/assets/bloodmagic/lang/en_us.json @@ -14,6 +14,25 @@ "block.bloodmagic.demoncrystallizer": "Demon Crystallizer", "block.bloodmagic.destructivedemoncrystal": "Destructive Crystal Cluster", "block.bloodmagic.dislocationrune": "Displacement Rune", + "block.bloodmagic.dungeon_brick1": "Demon Bricks", + "block.bloodmagic.dungeon_brick2": "Offset Demon Bricks", + "block.bloodmagic.dungeon_brick3": "Long Demon Bricks", + "block.bloodmagic.dungeon_brick_assorted": "Assorted Demon Bricks", + "block.bloodmagic.dungeon_brick_gate": "Demon Brick Gate", + "block.bloodmagic.dungeon_brick_stairs": "Demon Brick Stairs", + "block.bloodmagic.dungeon_brick_wall": "Demon Brick Wall", + "block.bloodmagic.dungeon_eye": "Demon Eye", + "block.bloodmagic.dungeon_pillar_cap": "Demon Stone Pillar Cap", + "block.bloodmagic.dungeon_pillar_center": "Demon Stone Pillar", + "block.bloodmagic.dungeon_pillar_special": "Accented Demon Stone Pillar", + "block.bloodmagic.dungeon_polished": "Polished Demon Stone", + "block.bloodmagic.dungeon_polished_gate": "Demon Stone Gate", + "block.bloodmagic.dungeon_polished_stairs": "Demon Stone Stairs", + "block.bloodmagic.dungeon_polished_wall": "Demon Stone Wall", + "block.bloodmagic.dungeon_smallbrick": "Small Demon Bricks", + "block.bloodmagic.dungeon_stone": "Demon Stone", + "block.bloodmagic.dungeon_tile": "Demon Stone Tiles", + "block.bloodmagic.dungeon_tilespecial": "Accented Demon Stone Tiles", "block.bloodmagic.duskritualstone": "Dusk Ritual Stone", "block.bloodmagic.earthritualstone": "Earth Ritual Stone", "block.bloodmagic.fireritualstone": "Fire Ritual Stone", diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick1.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick1.json new file mode 100644 index 00000000..67fd1fd3 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "bloodmagic:block/dungeon/dungeon_brick1" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick2.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick2.json new file mode 100644 index 00000000..f928def2 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "bloodmagic:block/dungeon/dungeon_brick2" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick3.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick3.json new file mode 100644 index 00000000..cde0ff61 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick3.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "bloodmagic:block/dungeon/dungeon_brick3" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_gate.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_gate.json new file mode 100644 index 00000000..e31759c0 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate", + "textures": { + "texture": "bloodmagic:block/dungeon/dungeon_brick1" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_gate_open.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_gate_open.json new file mode 100644 index 00000000..d4a81aaa --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_open", + "textures": { + "texture": "bloodmagic:block/dungeon/dungeon_brick1" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_gate_wall.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_gate_wall.json new file mode 100644 index 00000000..19ef409e --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_gate_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall", + "textures": { + "texture": "bloodmagic:block/dungeon/dungeon_brick1" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_gate_wall_open.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_gate_wall_open.json new file mode 100644 index 00000000..1d63b5c3 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_gate_wall_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall_open", + "textures": { + "texture": "bloodmagic:block/dungeon/dungeon_brick1" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_stairs.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_stairs.json new file mode 100644 index 00000000..97ec435b --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "bloodmagic:block/dungeon/dungeon_brick1", + "bottom": "bloodmagic:block/dungeon/dungeon_brick1", + "top": "bloodmagic:block/dungeon/dungeon_brick1" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_stairs_inner.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_stairs_inner.json new file mode 100644 index 00000000..ab8c305f --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "bloodmagic:block/dungeon/dungeon_brick1", + "bottom": "bloodmagic:block/dungeon/dungeon_brick1", + "top": "bloodmagic:block/dungeon/dungeon_brick1" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_stairs_outer.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_stairs_outer.json new file mode 100644 index 00000000..54284cbc --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "bloodmagic:block/dungeon/dungeon_brick1", + "bottom": "bloodmagic:block/dungeon/dungeon_brick1", + "top": "bloodmagic:block/dungeon/dungeon_brick1" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_wall_inventory.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_wall_inventory.json new file mode 100644 index 00000000..c90f1034 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "bloodmagic:block/dungeon/dungeon_brick1" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_wall_post.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_wall_post.json new file mode 100644 index 00000000..1e2aa564 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "bloodmagic:block/dungeon/dungeon_brick1" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_wall_side.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_wall_side.json new file mode 100644 index 00000000..d68f15be --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "bloodmagic:block/dungeon/dungeon_brick1" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_wall_side_tall.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_wall_side_tall.json new file mode 100644 index 00000000..88c3bc4a --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_brick_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "bloodmagic:block/dungeon/dungeon_brick1" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_eye.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_eye.json new file mode 100644 index 00000000..050b373a --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_eye.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "bloodmagic:block/dungeon/dungeon_eye" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap.json new file mode 100644 index 00000000..80da11c8 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "side": "bloodmagic:block/dungeon/dungeon_pillartop", + "bottom": "bloodmagic:block/dungeon/dungeon_pillarheart", + "top": "bloodmagic:block/dungeon/dungeon_pillarheart" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_down.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_down.json new file mode 100644 index 00000000..1c9c81fa --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_down.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/cube_bottom_top", + "textures": { + "side": "bloodmagic:block/dungeon/dungeon_pillarbottom", + "bottom": "bloodmagic:block/dungeon/dungeon_pillarheart", + "top": "bloodmagic:block/dungeon/dungeon_pillarheart" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_east.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_east.json new file mode 100644 index 00000000..ddca684f --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_east.json @@ -0,0 +1,59 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "particle": "bloodmagic:block/dungeon/dungeon_pillarheart", + "sideBottom": "bloodmagic:block/dungeon/dungeon_pillarbottom", + "end": "bloodmagic:block/dungeon/dungeon_pillarheart", + "sideTop": "bloodmagic:block/dungeon/dungeon_pillartop" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "texture": "#sideBottom", + "rotation": 270 + }, + "up": { + "texture": "#sideBottom", + "rotation": 270 + }, + "north": { + "texture": "#sideTop", + "rotation": 270 + }, + "south": { + "texture": "#sideBottom", + "rotation": 270 + }, + "west": { + "texture": "#end", + "uv": [ + 16.0, + 0.0, + 0.0, + 16.0 + ] + }, + "east": { + "texture": "#end", + "uv": [ + 16.0, + 0.0, + 0.0, + 16.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_north.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_north.json new file mode 100644 index 00000000..ba59597e --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_north.json @@ -0,0 +1,57 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "particle": "bloodmagic:block/dungeon/dungeon_pillarheart", + "sideBottom": "bloodmagic:block/dungeon/dungeon_pillarbottom", + "end": "bloodmagic:block/dungeon/dungeon_pillarheart", + "sideTop": "bloodmagic:block/dungeon/dungeon_pillartop" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "texture": "#sideBottom" + }, + "up": { + "texture": "#sideTop" + }, + "north": { + "texture": "#end" + }, + "south": { + "texture": "#end" + }, + "west": { + "texture": "#sideTop", + "uv": [ + 16.0, + 0.0, + 0.0, + 16.0 + ], + "rotation": 270 + }, + "east": { + "texture": "#sideBottom", + "uv": [ + 16.0, + 0.0, + 0.0, + 16.0 + ], + "rotation": 270 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_south.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_south.json new file mode 100644 index 00000000..643f943d --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_south.json @@ -0,0 +1,57 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "particle": "bloodmagic:block/dungeon/dungeon_pillarheart", + "sideBottom": "bloodmagic:block/dungeon/dungeon_pillarbottom", + "end": "bloodmagic:block/dungeon/dungeon_pillarheart", + "sideTop": "bloodmagic:block/dungeon/dungeon_pillartop" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "texture": "#sideTop" + }, + "up": { + "texture": "#sideBottom" + }, + "north": { + "texture": "#end" + }, + "south": { + "texture": "#end" + }, + "west": { + "texture": "#sideBottom", + "uv": [ + 16.0, + 0.0, + 0.0, + 16.0 + ], + "rotation": 270 + }, + "east": { + "texture": "#sideTop", + "uv": [ + 16.0, + 0.0, + 0.0, + 16.0 + ], + "rotation": 270 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_west.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_west.json new file mode 100644 index 00000000..d871f337 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_cap_west.json @@ -0,0 +1,59 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "particle": "bloodmagic:block/dungeon/dungeon_pillarheart", + "sideBottom": "bloodmagic:block/dungeon/dungeon_pillarbottom", + "end": "bloodmagic:block/dungeon/dungeon_pillarheart", + "sideTop": "bloodmagic:block/dungeon/dungeon_pillartop" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "texture": "#sideTop", + "rotation": 270 + }, + "up": { + "texture": "#sideTop", + "rotation": 270 + }, + "north": { + "texture": "#sideBottom", + "rotation": 270 + }, + "south": { + "texture": "#sideTop", + "rotation": 270 + }, + "west": { + "texture": "#end", + "uv": [ + 16.0, + 0.0, + 0.0, + 16.0 + ] + }, + "east": { + "texture": "#end", + "uv": [ + 16.0, + 0.0, + 0.0, + 16.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_center.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_center.json new file mode 100644 index 00000000..0ee75aa8 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_center.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "bloodmagic:block/dungeon/dungeon_pillar", + "end": "bloodmagic:block/dungeon/dungeon_pillarheart" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_center_x.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_center_x.json new file mode 100644 index 00000000..dc0d116a --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_center_x.json @@ -0,0 +1,58 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "particle": "bloodmagic:block/dungeon/dungeon_pillar", + "end": "bloodmagic:block/dungeon/dungeon_pillarheart", + "side": "bloodmagic:block/dungeon/dungeon_pillar" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "texture": "#side", + "rotation": 270 + }, + "up": { + "texture": "#side", + "rotation": 270 + }, + "north": { + "texture": "#side", + "rotation": 270 + }, + "south": { + "texture": "#side", + "rotation": 270 + }, + "west": { + "texture": "#end", + "uv": [ + 16.0, + 0.0, + 0.0, + 16.0 + ] + }, + "east": { + "texture": "#end", + "uv": [ + 16.0, + 0.0, + 0.0, + 16.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_center_z.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_center_z.json new file mode 100644 index 00000000..8cf66442 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_center_z.json @@ -0,0 +1,56 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "particle": "bloodmagic:block/dungeon/dungeon_pillar", + "end": "bloodmagic:block/dungeon/dungeon_pillarheart", + "side": "bloodmagic:block/dungeon/dungeon_pillar" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "texture": "#side" + }, + "up": { + "texture": "#side" + }, + "north": { + "texture": "#end" + }, + "south": { + "texture": "#end" + }, + "west": { + "texture": "#side", + "uv": [ + 16.0, + 0.0, + 0.0, + 16.0 + ], + "rotation": 270 + }, + "east": { + "texture": "#side", + "uv": [ + 16.0, + 0.0, + 0.0, + 16.0 + ], + "rotation": 270 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_special.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_special.json new file mode 100644 index 00000000..3ad64eb6 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_special.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "side": "bloodmagic:block/dungeon/dungeon_pillarspecial", + "end": "bloodmagic:block/dungeon/dungeon_pillarheart" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_special_x.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_special_x.json new file mode 100644 index 00000000..4c04aa89 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_special_x.json @@ -0,0 +1,58 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "particle": "bloodmagic:block/dungeon/dungeon_pillarspecial", + "end": "bloodmagic:block/dungeon/dungeon_pillarheart", + "side": "bloodmagic:block/dungeon/dungeon_pillarspecial" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "texture": "#side", + "rotation": 270 + }, + "up": { + "texture": "#side", + "rotation": 270 + }, + "north": { + "texture": "#side", + "rotation": 270 + }, + "south": { + "texture": "#side", + "rotation": 270 + }, + "west": { + "texture": "#end", + "uv": [ + 16.0, + 0.0, + 0.0, + 16.0 + ] + }, + "east": { + "texture": "#end", + "uv": [ + 16.0, + 0.0, + 0.0, + 16.0 + ] + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_special_z.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_special_z.json new file mode 100644 index 00000000..5c198826 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_pillar_special_z.json @@ -0,0 +1,56 @@ +{ + "parent": "minecraft:block/cube", + "textures": { + "particle": "bloodmagic:block/dungeon/dungeon_pillarspecial", + "end": "bloodmagic:block/dungeon/dungeon_pillarheart", + "side": "bloodmagic:block/dungeon/dungeon_pillarspecial" + }, + "elements": [ + { + "from": [ + 0, + 0, + 0 + ], + "to": [ + 16, + 16, + 16 + ], + "faces": { + "down": { + "texture": "#side" + }, + "up": { + "texture": "#side" + }, + "north": { + "texture": "#end" + }, + "south": { + "texture": "#end" + }, + "west": { + "texture": "#side", + "uv": [ + 16.0, + 0.0, + 0.0, + 16.0 + ], + "rotation": 270 + }, + "east": { + "texture": "#side", + "uv": [ + 16.0, + 0.0, + 0.0, + 16.0 + ], + "rotation": 270 + } + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished.json new file mode 100644 index 00000000..0cfce680 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "bloodmagic:block/dungeon/dungeon_polished" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_gate.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_gate.json new file mode 100644 index 00000000..00d14be8 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_gate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate", + "textures": { + "texture": "bloodmagic:block/dungeon/dungeon_polished" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_gate_open.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_gate_open.json new file mode 100644 index 00000000..eeeb11e3 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_gate_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_open", + "textures": { + "texture": "bloodmagic:block/dungeon/dungeon_polished" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_gate_wall.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_gate_wall.json new file mode 100644 index 00000000..5a753921 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_gate_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall", + "textures": { + "texture": "bloodmagic:block/dungeon/dungeon_polished" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_gate_wall_open.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_gate_wall_open.json new file mode 100644 index 00000000..94f199d1 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_gate_wall_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_fence_gate_wall_open", + "textures": { + "texture": "bloodmagic:block/dungeon/dungeon_polished" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_stairs.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_stairs.json new file mode 100644 index 00000000..291e9cff --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "side": "bloodmagic:block/dungeon/dungeon_polished", + "bottom": "bloodmagic:block/dungeon/dungeon_polished", + "top": "bloodmagic:block/dungeon/dungeon_polished" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_stairs_inner.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_stairs_inner.json new file mode 100644 index 00000000..f74477bd --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "side": "bloodmagic:block/dungeon/dungeon_polished", + "bottom": "bloodmagic:block/dungeon/dungeon_polished", + "top": "bloodmagic:block/dungeon/dungeon_polished" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_stairs_outer.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_stairs_outer.json new file mode 100644 index 00000000..7df9f548 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "side": "bloodmagic:block/dungeon/dungeon_polished", + "bottom": "bloodmagic:block/dungeon/dungeon_polished", + "top": "bloodmagic:block/dungeon/dungeon_polished" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_wall_inventory.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_wall_inventory.json new file mode 100644 index 00000000..1b6724a7 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "bloodmagic:block/dungeon/dungeon_polished" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_wall_post.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_wall_post.json new file mode 100644 index 00000000..a65da079 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "bloodmagic:block/dungeon/dungeon_polished" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_wall_side.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_wall_side.json new file mode 100644 index 00000000..c2da5f14 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "bloodmagic:block/dungeon/dungeon_polished" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_wall_side_tall.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_wall_side_tall.json new file mode 100644 index 00000000..2d55b1bc --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_polished_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "bloodmagic:block/dungeon/dungeon_polished" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_smallbrick.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_smallbrick.json new file mode 100644 index 00000000..dd5793ed --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_smallbrick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "bloodmagic:block/dungeon/dungeon_smallbrick" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_stone.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_stone.json new file mode 100644 index 00000000..e76740d6 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "bloodmagic:block/dungeon/dungeon_stone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_stone_mirrored.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_stone_mirrored.json new file mode 100644 index 00000000..3b579c73 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_stone_mirrored.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_mirrored_all", + "textures": { + "all": "bloodmagic:block/dungeon/dungeon_stone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_tile.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_tile.json new file mode 100644 index 00000000..8f93a06d --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_tile.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "bloodmagic:block/dungeon/dungeon_tile" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/block/dungeon_tilespecial.json b/src/generated/resources/assets/bloodmagic/models/block/dungeon_tilespecial.json new file mode 100644 index 00000000..2fb38846 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/block/dungeon_tilespecial.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "bloodmagic:block/dungeon/dungeon_tilespecial" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick1.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick1.json new file mode 100644 index 00000000..11d3536b --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick1.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/dungeon_brick1" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick2.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick2.json new file mode 100644 index 00000000..5f9095c0 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick2.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/dungeon_brick2" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick3.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick3.json new file mode 100644 index 00000000..fc97a2a2 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick3.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/dungeon_brick3" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick_assorted.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick_assorted.json new file mode 100644 index 00000000..11d3536b --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick_assorted.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/dungeon_brick1" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick_gate.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick_gate.json new file mode 100644 index 00000000..818f37f8 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick_gate.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/dungeon_brick_gate" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick_stairs.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick_stairs.json new file mode 100644 index 00000000..f4f7c835 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/dungeon_brick_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick_wall.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick_wall.json new file mode 100644 index 00000000..ee594c7e --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/dungeon_brick_wall.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/dungeon_brick_wall_inventory" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_eye.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_eye.json new file mode 100644 index 00000000..b306aa4e --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/dungeon_eye.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/dungeon_eye" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_pillar_cap.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_pillar_cap.json new file mode 100644 index 00000000..03211bec --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/dungeon_pillar_cap.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/dungeon_pillar_cap" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_pillar_center.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_pillar_center.json new file mode 100644 index 00000000..7a965604 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/dungeon_pillar_center.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/dungeon_pillar_center" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_pillar_special.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_pillar_special.json new file mode 100644 index 00000000..dcbe8148 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/dungeon_pillar_special.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/dungeon_pillar_special" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_polished.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_polished.json new file mode 100644 index 00000000..334777b9 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/dungeon_polished.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/dungeon_polished" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_polished_gate.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_polished_gate.json new file mode 100644 index 00000000..ec9c6b87 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/dungeon_polished_gate.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/dungeon_polished_gate" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_polished_stairs.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_polished_stairs.json new file mode 100644 index 00000000..cb02affc --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/dungeon_polished_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/dungeon_polished_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_polished_wall.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_polished_wall.json new file mode 100644 index 00000000..f02221cf --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/dungeon_polished_wall.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/dungeon_polished_wall_inventory" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_smallbrick.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_smallbrick.json new file mode 100644 index 00000000..2ccf3f92 --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/dungeon_smallbrick.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/dungeon_smallbrick" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_stone.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_stone.json new file mode 100644 index 00000000..4c9c2b6a --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/dungeon_stone.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/dungeon_stone" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_tile.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_tile.json new file mode 100644 index 00000000..4c80f99b --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/dungeon_tile.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/dungeon_tile" +} \ No newline at end of file diff --git a/src/generated/resources/assets/bloodmagic/models/item/dungeon_tilespecial.json b/src/generated/resources/assets/bloodmagic/models/item/dungeon_tilespecial.json new file mode 100644 index 00000000..98d6dc5a --- /dev/null +++ b/src/generated/resources/assets/bloodmagic/models/item/dungeon_tilespecial.json @@ -0,0 +1,3 @@ +{ + "parent": "bloodmagic:block/dungeon_tilespecial" +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_reader.json b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_reader.json new file mode 100644 index 00000000..f6f08c7a --- /dev/null +++ b/src/generated/resources/data/bloodmagic/advancements/recipes/bloodmagictab/ritual_reader.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "rewards": { + "recipes": [ + "bloodmagic:ritual_reader" + ] + }, + "criteria": { + "has_master_orb": { + "trigger": "minecraft:inventory_changed", + "conditions": { + "items": [ + { + "item": "bloodmagic:masterbloodorb" + } + ] + } + }, + "has_the_recipe": { + "trigger": "minecraft:recipe_unlocked", + "conditions": { + "recipe": "bloodmagic:ritual_reader" + } + } + }, + "requirements": [ + [ + "has_master_orb", + "has_the_recipe" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick1.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick1.json new file mode 100644 index 00000000..5bf91c81 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick1.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:dungeon_brick1" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick2.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick2.json new file mode 100644 index 00000000..491a46ec --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick2.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:dungeon_brick2" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick3.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick3.json new file mode 100644 index 00000000..ef502cb0 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick3.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:dungeon_brick3" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick_assorted.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick_assorted.json new file mode 100644 index 00000000..01211879 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick_assorted.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:dungeon_brick_assorted" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick_gate.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick_gate.json new file mode 100644 index 00000000..bd9af9b7 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick_gate.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:dungeon_brick_gate" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick_stairs.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick_stairs.json new file mode 100644 index 00000000..8df43bad --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick_stairs.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:dungeon_brick_stairs" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick_wall.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick_wall.json new file mode 100644 index 00000000..f047c0cd --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_brick_wall.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:dungeon_brick_wall" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_eye.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_eye.json new file mode 100644 index 00000000..d7a703f1 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_eye.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:dungeon_eye" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_pillar_cap.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_pillar_cap.json new file mode 100644 index 00000000..29906c2d --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_pillar_cap.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:dungeon_pillar_cap" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_pillar_center.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_pillar_center.json new file mode 100644 index 00000000..5aa43bb8 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_pillar_center.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:dungeon_pillar_center" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_pillar_special.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_pillar_special.json new file mode 100644 index 00000000..bde90c58 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_pillar_special.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:dungeon_pillar_special" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_polished.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_polished.json new file mode 100644 index 00000000..fa0436f5 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_polished.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:dungeon_polished" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_polished_gate.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_polished_gate.json new file mode 100644 index 00000000..46d3c924 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_polished_gate.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:dungeon_polished_gate" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_polished_stairs.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_polished_stairs.json new file mode 100644 index 00000000..fc7d93be --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_polished_stairs.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:dungeon_polished_stairs" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_polished_wall.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_polished_wall.json new file mode 100644 index 00000000..e3c69dbb --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_polished_wall.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:dungeon_polished_wall" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_smallbrick.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_smallbrick.json new file mode 100644 index 00000000..872ac5de --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_smallbrick.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:dungeon_smallbrick" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_stone.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_stone.json new file mode 100644 index 00000000..7fc9228d --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_stone.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:dungeon_stone" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_tile.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_tile.json new file mode 100644 index 00000000..b8211e0f --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_tile.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:dungeon_tile" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_tilespecial.json b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_tilespecial.json new file mode 100644 index 00000000..3f90bc80 --- /dev/null +++ b/src/generated/resources/data/bloodmagic/loot_tables/blocks/dungeon_tilespecial.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "bloodmagic:dungeon_tilespecial" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/bloodmagic/recipes/ritual_reader.json b/src/generated/resources/data/bloodmagic/recipes/ritual_reader.json new file mode 100644 index 00000000..27805eff --- /dev/null +++ b/src/generated/resources/data/bloodmagic/recipes/ritual_reader.json @@ -0,0 +1,26 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "gog", + "isi", + " s " + ], + "key": { + "s": { + "item": "bloodmagic:demonslate" + }, + "g": { + "tag": "forge:glass" + }, + "i": { + "tag": "forge:ingots/gold" + }, + "o": { + "type": "bloodmagic:bloodorb", + "orb_tier": 4 + } + }, + "result": { + "item": "bloodmagic:ritualtinkerer" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/walls.json b/src/generated/resources/data/minecraft/tags/blocks/walls.json new file mode 100644 index 00000000..a79e9654 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/walls.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "bloodmagic:dungeon_brick_wall", + "bloodmagic:dungeon_polished_wall" + ] +} \ No newline at end of file diff --git a/src/main/java/wayoftime/bloodmagic/BloodMagic.java b/src/main/java/wayoftime/bloodmagic/BloodMagic.java index b5cf2d93..716bb7ad 100644 --- a/src/main/java/wayoftime/bloodmagic/BloodMagic.java +++ b/src/main/java/wayoftime/bloodmagic/BloodMagic.java @@ -92,6 +92,7 @@ public class BloodMagic BloodMagicItems.BLOOD_ORBS.createAndRegister(modBus, "bloodorbs"); BloodMagicItems.BASICITEMS.register(modBus); BloodMagicBlocks.BASICBLOCKS.register(modBus); + BloodMagicBlocks.DUNGEONBLOCKS.register(modBus); BloodMagicBlocks.FLUIDS.register(modBus); BloodMagicBlocks.CONTAINERS.register(modBus); BloodMagicEntityTypes.ENTITY_TYPES.register(modBus); diff --git a/src/main/java/wayoftime/bloodmagic/common/block/BloodMagicBlocks.java b/src/main/java/wayoftime/bloodmagic/common/block/BloodMagicBlocks.java index 3f00677c..62e75d65 100644 --- a/src/main/java/wayoftime/bloodmagic/common/block/BloodMagicBlocks.java +++ b/src/main/java/wayoftime/bloodmagic/common/block/BloodMagicBlocks.java @@ -3,8 +3,12 @@ package wayoftime.bloodmagic.common.block; import net.minecraft.block.AbstractBlock; import net.minecraft.block.AbstractBlock.Properties; import net.minecraft.block.Block; +import net.minecraft.block.FenceGateBlock; import net.minecraft.block.FlowingFluidBlock; +import net.minecraft.block.RotatedPillarBlock; import net.minecraft.block.SoundType; +import net.minecraft.block.StairsBlock; +import net.minecraft.block.WallBlock; import net.minecraft.block.material.Material; import net.minecraft.fluid.FlowingFluid; import net.minecraft.fluid.Fluid; @@ -22,6 +26,7 @@ import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; import wayoftime.bloodmagic.BloodMagic; import wayoftime.bloodmagic.block.enums.BloodRuneType; +import wayoftime.bloodmagic.common.block.base.BlockPillarCap; import wayoftime.bloodmagic.common.item.BloodMagicItems; import wayoftime.bloodmagic.ritual.EnumRuneType; import wayoftime.bloodmagic.tile.contailer.ContainerAlchemicalReactionChamber; @@ -36,6 +41,7 @@ public class BloodMagicBlocks public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, BloodMagic.MODID); public static final DeferredRegister BASICBLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, BloodMagic.MODID); + public static final DeferredRegister DUNGEONBLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, BloodMagic.MODID); public static final DeferredRegister ITEMS = BloodMagicItems.ITEMS; public static final DeferredRegister FLUIDS = DeferredRegister.create(ForgeRegistries.FLUIDS, BloodMagic.MODID); public static final DeferredRegister> CONTAINERS = DeferredRegister.create(ForgeRegistries.CONTAINERS, BloodMagic.MODID); @@ -107,8 +113,35 @@ public class BloodMagicBlocks public static final RegistryObject> ARC_CONTAINER = CONTAINERS.register("arc_container", () -> IForgeContainerType.create(ContainerAlchemicalReactionChamber::new)); public static final RegistryObject> ALCHEMY_TABLE_CONTAINER = CONTAINERS.register("alchemy_table_container", () -> IForgeContainerType.create(ContainerAlchemyTable::new)); -// public static final RegistryObject BLOOD_STONE = registerNoItem("blood_stone", () -> new BloodstoneBlock()); -// + // Dungeon Blocks + public static final RegistryObject DUNGEON_BRICK_1 = DUNGEONBLOCKS.register("dungeon_brick1", () -> new Block(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); + public static final RegistryObject DUNGEON_BRICK_2 = DUNGEONBLOCKS.register("dungeon_brick2", () -> new Block(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); + public static final RegistryObject DUNGEON_BRICK_3 = DUNGEONBLOCKS.register("dungeon_brick3", () -> new Block(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); + + public static final RegistryObject DUNGEON_STONE = BLOCKS.register("dungeon_stone", () -> new Block(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); + public static final RegistryObject DUNGEON_EYE = DUNGEONBLOCKS.register("dungeon_eye", () -> new Block(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool().setLightLevel((state) -> { + return 15; + }))); + public static final RegistryObject DUNGEON_POLISHED_STONE = DUNGEONBLOCKS.register("dungeon_polished", () -> new Block(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); + public static final RegistryObject DUNGEON_TILE = DUNGEONBLOCKS.register("dungeon_tile", () -> new Block(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); + public static final RegistryObject DUNGEON_SMALL_BRICK = DUNGEONBLOCKS.register("dungeon_smallbrick", () -> new Block(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); + public static final RegistryObject DUNGEON_TILE_SPECIAL = DUNGEONBLOCKS.register("dungeon_tilespecial", () -> new Block(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); + + public static final RegistryObject DUNGEON_BRICK_ASSORTED = BLOCKS.register("dungeon_brick_assorted", () -> new Block(Properties.create(Material.ROCK).hardnessAndResistance(20.0F, 50.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(3).setRequiresTool())); + + public static final RegistryObject DUNGEON_BRICK_STAIRS = BLOCKS.register("dungeon_brick_stairs", () -> new StairsBlock(() -> DUNGEON_BRICK_1.get().getDefaultState(), Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); + public static final RegistryObject DUNGEON_POLISHED_STAIRS = BLOCKS.register("dungeon_polished_stairs", () -> new StairsBlock(() -> DUNGEON_POLISHED_STONE.get().getDefaultState(), Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); + + public static final RegistryObject DUNGEON_PILLAR_CENTER = BLOCKS.register("dungeon_pillar_center", () -> new RotatedPillarBlock(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); + public static final RegistryObject DUNGEON_PILLAR_SPECIAL = BLOCKS.register("dungeon_pillar_special", () -> new RotatedPillarBlock(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); + public static final RegistryObject DUNGEON_PILLAR_CAP = BLOCKS.register("dungeon_pillar_cap", () -> new BlockPillarCap(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); + + public static final RegistryObject DUNGEON_BRICK_WALL = BLOCKS.register("dungeon_brick_wall", () -> new WallBlock(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); + public static final RegistryObject DUNGEON_POLISHED_WALL = BLOCKS.register("dungeon_polished_wall", () -> new WallBlock(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); + public static final RegistryObject DUNGEON_BRICK_GATE = BLOCKS.register("dungeon_brick_gate", () -> new FenceGateBlock(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); + public static final RegistryObject DUNGEON_POLISHED_GATE = BLOCKS.register("dungeon_polished_gate", () -> new FenceGateBlock(Properties.create(Material.ROCK).hardnessAndResistance(2.0F, 5.0F).sound(SoundType.STONE).harvestTool(ToolType.PICKAXE).harvestLevel(2).setRequiresTool())); + + // //// private static RegistryObject register(String name, Supplier sup, Function, Supplier> itemCreator) //// { //// RegistryObject ret = registerNoItem(name, sup); diff --git a/src/main/java/wayoftime/bloodmagic/common/block/base/BlockPillarCap.java b/src/main/java/wayoftime/bloodmagic/common/block/base/BlockPillarCap.java new file mode 100644 index 00000000..f82a16af --- /dev/null +++ b/src/main/java/wayoftime/bloodmagic/common/block/base/BlockPillarCap.java @@ -0,0 +1,58 @@ +package wayoftime.bloodmagic.common.block.base; + +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.item.BlockItemUseContext; +import net.minecraft.state.DirectionProperty; +import net.minecraft.state.StateContainer; +import net.minecraft.state.properties.BlockStateProperties; +import net.minecraft.util.Mirror; +import net.minecraft.util.Rotation; + +public class BlockPillarCap extends Block +{ + public static final DirectionProperty FACING = BlockStateProperties.FACING; + + public BlockPillarCap(Properties prop) + { + super(prop); + } + + @Override + public BlockState getStateForPlacement(BlockItemUseContext context) + { + return this.getDefaultState().with(FACING, context.getFace()); + } + + /** + * Returns the blockstate with the given rotation from the passed blockstate. If + * inapplicable, returns the passed blockstate. + * + * @deprecated call via {@link IBlockState#withRotation(Rotation)} whenever + * possible. Implementing/overriding is fine. + */ + @Override + public BlockState rotate(BlockState state, Rotation rot) + { + return state.with(FACING, rot.rotate(state.get(FACING))); + } + + /** + * Returns the blockstate with the given mirror of the passed blockstate. If + * inapplicable, returns the passed blockstate. + * + * @deprecated call via {@link IBlockState#withMirror(Mirror)} whenever + * possible. Implementing/overriding is fine. + */ + @Override + public BlockState mirror(BlockState state, Mirror mirrorIn) + { + return state.rotate(mirrorIn.toRotation(state.get(FACING))); + } + + @Override + protected void fillStateContainer(StateContainer.Builder builder) + { + builder.add(FACING); + } +} diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBlockStates.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBlockStates.java index d9608871..1f539ae2 100644 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBlockStates.java +++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBlockStates.java @@ -1,11 +1,19 @@ package wayoftime.bloodmagic.common.data; import net.minecraft.block.Block; +import net.minecraft.block.FenceGateBlock; +import net.minecraft.block.RotatedPillarBlock; +import net.minecraft.block.StairsBlock; +import net.minecraft.block.WallBlock; import net.minecraft.data.DataGenerator; import net.minecraft.util.Direction; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.generators.BlockModelBuilder; import net.minecraftforge.client.model.generators.BlockStateProvider; import net.minecraftforge.client.model.generators.ConfiguredModel; import net.minecraftforge.client.model.generators.ConfiguredModel.Builder; +import net.minecraftforge.client.model.generators.ModelBuilder.ElementBuilder; +import net.minecraftforge.client.model.generators.ModelBuilder.FaceRotation; import net.minecraftforge.client.model.generators.ModelFile; import net.minecraftforge.client.model.generators.MultiPartBlockStateBuilder; import net.minecraftforge.client.model.generators.MultiPartBlockStateBuilder.PartBuilder; @@ -16,6 +24,7 @@ import wayoftime.bloodmagic.BloodMagic; import wayoftime.bloodmagic.common.block.BlockAlchemicalReactionChamber; import wayoftime.bloodmagic.common.block.BlockDemonCrystal; import wayoftime.bloodmagic.common.block.BloodMagicBlocks; +import wayoftime.bloodmagic.common.block.base.BlockPillarCap; public class GeneratorBlockStates extends BlockStateProvider { @@ -35,6 +44,11 @@ public class GeneratorBlockStates extends BlockStateProvider buildCubeAll(block.get()); } + for (RegistryObject block : BloodMagicBlocks.DUNGEONBLOCKS.getEntries()) + { + buildDungeonBlock(block.get()); + } + buildCubeAll(BloodMagicBlocks.BLOOD_LIGHT.get()); buildCubeAll(BloodMagicBlocks.BLANK_RITUAL_STONE.get()); buildCubeAll(BloodMagicBlocks.AIR_RITUAL_STONE.get()); @@ -51,6 +65,155 @@ public class GeneratorBlockStates extends BlockStateProvider buildCrystal(BloodMagicBlocks.DESTRUCTIVE_CRYSTAL_BLOCK.get(), "destructivecrystal"); buildCrystal(BloodMagicBlocks.VENGEFUL_CRYSTAL_BLOCK.get(), "vengefulcrystal"); buildCrystal(BloodMagicBlocks.STEADFAST_CRYSTAL_BLOCK.get(), "steadfastcrystal"); + + buildRandomStone(BloodMagicBlocks.DUNGEON_STONE.get(), BloodMagic.rl("block/dungeon/dungeon_stone")); + stairsBlock((StairsBlock) BloodMagicBlocks.DUNGEON_BRICK_STAIRS.get(), BloodMagic.rl("block/dungeon/dungeon_brick1")); + stairsBlock((StairsBlock) BloodMagicBlocks.DUNGEON_POLISHED_STAIRS.get(), BloodMagic.rl("block/dungeon/dungeon_polished")); + buildPillarCenter(BloodMagicBlocks.DUNGEON_PILLAR_CENTER.get(), BloodMagic.rl("block/dungeon/dungeon_pillar"), BloodMagic.rl("block/dungeon/dungeon_pillarheart")); + buildPillarCenter(BloodMagicBlocks.DUNGEON_PILLAR_SPECIAL.get(), BloodMagic.rl("block/dungeon/dungeon_pillarspecial"), BloodMagic.rl("block/dungeon/dungeon_pillarheart")); + buildWallInventory((WallBlock) BloodMagicBlocks.DUNGEON_BRICK_WALL.get(), BloodMagic.rl("block/dungeon/dungeon_brick1")); + buildWallInventory((WallBlock) BloodMagicBlocks.DUNGEON_POLISHED_WALL.get(), BloodMagic.rl("block/dungeon/dungeon_polished")); + fenceGateBlock((FenceGateBlock) BloodMagicBlocks.DUNGEON_BRICK_GATE.get(), BloodMagic.rl("block/dungeon/dungeon_brick1")); + fenceGateBlock((FenceGateBlock) BloodMagicBlocks.DUNGEON_POLISHED_GATE.get(), BloodMagic.rl("block/dungeon/dungeon_polished")); + + buildPillarCap(BloodMagicBlocks.DUNGEON_PILLAR_CAP.get(), BloodMagic.rl("block/dungeon/dungeon_pillarheart"), BloodMagic.rl("block/dungeon/dungeon_pillarbottom"), BloodMagic.rl("block/dungeon/dungeon_pillartop")); + + buildAssortedBlock(BloodMagicBlocks.DUNGEON_BRICK_ASSORTED.get(), modLoc("dungeon_brick1"), modLoc("dungeon_brick2"), modLoc("dungeon_brick3")); + } + + private void buildAssortedBlock(Block block, ResourceLocation... modelResources) + { + getVariantBuilder(block).forAllStates(state -> { + Builder builder = ConfiguredModel.builder(); + + for (int i = 0; i < modelResources.length; i++) + { + ResourceLocation location = modelResources[i]; + ModelFile file = models().getExistingFile(location); + if (i < modelResources.length - 1) + { + builder = builder.modelFile(file).nextModel(); + } else + { + builder = builder.modelFile(file); + } + } + + return builder.build(); + }); + } + + private void buildRandomStone(Block block, ResourceLocation texture) + { + String basePath = block.getRegistryName().getPath(); + ModelFile modelFile = models().cubeAll(basePath, texture); + ModelFile modelFile_mirrored = models().withExistingParent(basePath + "_mirrored", "cube_mirrored_all").texture("all", texture); + getVariantBuilder(block).forAllStates(state -> ConfiguredModel.builder().modelFile(modelFile).nextModel().modelFile(modelFile_mirrored).nextModel().modelFile(modelFile).rotationY(180).nextModel().modelFile(modelFile_mirrored).rotationY(180).build()); + } + + private void buildWallInventory(WallBlock block, ResourceLocation texture) + { + String basePath = block.getRegistryName().getPath(); + wallBlock(block, texture); + ModelFile file = models().wallInventory(basePath + "_inventory", texture); + file.assertExistence(); + } + + private void buildDungeonBlock(Block block) + { + String basePath = block.getRegistryName().getPath(); + ModelFile modelFile = models().cubeAll(basePath, BloodMagic.rl("block/dungeon/" + basePath)); + getVariantBuilder(block).forAllStates(state -> ConfiguredModel.builder().modelFile(modelFile).build()); +// ModelFile furnace_off = models().cubeAll(block.getRegistryName().toString(), texture)\ + } + + private void buildPillarCenter(Block block, ResourceLocation side, ResourceLocation pillarEnd) + { + String basePath = block.getRegistryName().getPath(); + ModelFile yModel = models().cubeColumn(basePath, side, pillarEnd); + + ElementBuilder xElementBuilder = models().withExistingParent(basePath + "_x", "cube").texture("particle", side).texture("end", pillarEnd).texture("side", side).element(); + xElementBuilder.face(Direction.UP).uvs(0, 0, 16, 16).texture("#side").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); + xElementBuilder.face(Direction.DOWN).uvs(0, 0, 16, 16).texture("#side").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); + xElementBuilder.face(Direction.NORTH).uvs(0, 0, 16, 16).texture("#side").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); + xElementBuilder.face(Direction.SOUTH).uvs(0, 0, 16, 16).texture("#side").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); + xElementBuilder.face(Direction.WEST).uvs(16, 0, 0, 16).texture("#end").end(); + xElementBuilder.face(Direction.EAST).uvs(16, 0, 0, 16).texture("#end").end(); + ModelFile xModel = xElementBuilder.end(); + + ElementBuilder zElementBuilder = models().withExistingParent(basePath + "_z", "cube").texture("particle", side).texture("end", pillarEnd).texture("side", side).element(); + zElementBuilder.face(Direction.UP).uvs(0, 0, 16, 16).texture("#side").end(); + zElementBuilder.face(Direction.DOWN).uvs(0, 0, 16, 16).texture("#side").end(); + zElementBuilder.face(Direction.NORTH).uvs(0, 0, 16, 16).texture("#end").end(); + zElementBuilder.face(Direction.SOUTH).uvs(0, 0, 16, 16).texture("#end").end(); + zElementBuilder.face(Direction.WEST).uvs(16, 0, 0, 16).texture("#side").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); + zElementBuilder.face(Direction.EAST).uvs(16, 0, 0, 16).texture("#side").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); + ModelFile zModel = zElementBuilder.end(); + + VariantBlockStateBuilder builder = getVariantBuilder(block); + builder.partialState().with(RotatedPillarBlock.AXIS, Direction.Axis.X).modelForState().modelFile(xModel).addModel(); + builder.partialState().with(RotatedPillarBlock.AXIS, Direction.Axis.Y).modelForState().modelFile(yModel).addModel(); + builder.partialState().with(RotatedPillarBlock.AXIS, Direction.Axis.Z).modelForState().modelFile(zModel).addModel(); + } + + private void buildPillarCap(Block block, ResourceLocation pillarEnd, ResourceLocation sideBottom, ResourceLocation sideTop) + { + String basePath = block.getRegistryName().getPath(); + ModelFile upModel = models().cubeBottomTop(basePath, sideTop, pillarEnd, pillarEnd); + ModelFile downModel = models().cubeBottomTop(basePath + "_down", sideBottom, pillarEnd, pillarEnd); + + ElementBuilder northElementBuilder = models().withExistingParent(basePath + "_north", "cube").texture("particle", pillarEnd).texture("sideBottom", sideBottom).texture("end", pillarEnd).texture("sideTop", sideTop).element(); + northElementBuilder.face(Direction.UP).uvs(0, 0, 16, 16).texture("#sideTop").end(); + northElementBuilder.face(Direction.DOWN).uvs(0, 0, 16, 16).texture("#sideBottom").end(); + northElementBuilder.face(Direction.NORTH).uvs(0, 0, 16, 16).texture("#end").end(); + northElementBuilder.face(Direction.SOUTH).uvs(0, 0, 16, 16).texture("#end").end(); + northElementBuilder.face(Direction.WEST).uvs(16, 0, 0, 16).texture("#sideTop").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); + northElementBuilder.face(Direction.EAST).uvs(16, 0, 0, 16).texture("#sideBottom").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); + ModelFile northModel = northElementBuilder.end(); + + ElementBuilder southElementBuilder = models().withExistingParent(basePath + "_south", "cube").texture("particle", pillarEnd).texture("sideBottom", sideBottom).texture("end", pillarEnd).texture("sideTop", sideTop).element(); + southElementBuilder.face(Direction.UP).uvs(0, 0, 16, 16).texture("#sideBottom").end(); + southElementBuilder.face(Direction.DOWN).uvs(0, 0, 16, 16).texture("#sideTop").end(); + southElementBuilder.face(Direction.NORTH).uvs(0, 0, 16, 16).texture("#end").end(); + southElementBuilder.face(Direction.SOUTH).uvs(0, 0, 16, 16).texture("#end").end(); + southElementBuilder.face(Direction.WEST).uvs(16, 0, 0, 16).texture("#sideBottom").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); + southElementBuilder.face(Direction.EAST).uvs(16, 0, 0, 16).texture("#sideTop").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); + ModelFile southModel = southElementBuilder.end(); + + ElementBuilder westElementBuilder = models().withExistingParent(basePath + "_west", "cube").texture("particle", pillarEnd).texture("sideBottom", sideBottom).texture("end", pillarEnd).texture("sideTop", sideTop).element(); + westElementBuilder.face(Direction.UP).uvs(0, 0, 16, 16).texture("#sideTop").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); + westElementBuilder.face(Direction.DOWN).uvs(0, 0, 16, 16).texture("#sideTop").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); + westElementBuilder.face(Direction.NORTH).uvs(0, 0, 16, 16).texture("#sideBottom").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); + westElementBuilder.face(Direction.SOUTH).uvs(0, 0, 16, 16).texture("#sideTop").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); + westElementBuilder.face(Direction.WEST).uvs(16, 0, 0, 16).texture("#end").end(); + westElementBuilder.face(Direction.EAST).uvs(16, 0, 0, 16).texture("#end").end(); + ModelFile westModel = westElementBuilder.end(); + + ElementBuilder eastElementBuilder = models().withExistingParent(basePath + "_east", "cube").texture("particle", pillarEnd).texture("sideBottom", sideBottom).texture("end", pillarEnd).texture("sideTop", sideTop).element(); + eastElementBuilder.face(Direction.UP).uvs(0, 0, 16, 16).texture("#sideBottom").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); + eastElementBuilder.face(Direction.DOWN).uvs(0, 0, 16, 16).texture("#sideBottom").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); + eastElementBuilder.face(Direction.NORTH).uvs(0, 0, 16, 16).texture("#sideTop").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); + eastElementBuilder.face(Direction.SOUTH).uvs(0, 0, 16, 16).texture("#sideBottom").rotation(FaceRotation.COUNTERCLOCKWISE_90).end(); + eastElementBuilder.face(Direction.WEST).uvs(16, 0, 0, 16).texture("#end").end(); + eastElementBuilder.face(Direction.EAST).uvs(16, 0, 0, 16).texture("#end").end(); + ModelFile eastModel = eastElementBuilder.end(); + + VariantBlockStateBuilder builder = getVariantBuilder(block); + builder.partialState().with(BlockPillarCap.FACING, Direction.UP).modelForState().modelFile(upModel).addModel(); + builder.partialState().with(BlockPillarCap.FACING, Direction.DOWN).modelForState().modelFile(downModel).addModel(); + builder.partialState().with(BlockPillarCap.FACING, Direction.NORTH).modelForState().modelFile(northModel).addModel(); + builder.partialState().with(BlockPillarCap.FACING, Direction.SOUTH).modelForState().modelFile(southModel).addModel(); + builder.partialState().with(BlockPillarCap.FACING, Direction.WEST).modelForState().modelFile(westModel).addModel(); + builder.partialState().with(BlockPillarCap.FACING, Direction.EAST).modelForState().modelFile(eastModel).addModel(); + } + + private BlockModelBuilder rotateTextureFace(BlockModelBuilder file, Direction face, FaceRotation rotation, String texture) + { +// BiConsumer.ElementBuilder.FaceBuilder> biCon = (fc, rot) -> { +// rot.rotation(rotation).texture(texture); +// }; + return file.element().face(face).uvs(16, 0, 0, 16).rotation(rotation).texture("#east").end().end(); +// return file.element().faces(biCon).texture("#east").end(); } private void buildCubeAll(Block block) @@ -58,6 +221,11 @@ public class GeneratorBlockStates extends BlockStateProvider getVariantBuilder(block).forAllStates(state -> ConfiguredModel.builder().modelFile(cubeAll(block)).build()); } +// private void buildStairs(StairsBlock block, ResourceLocation texture) +// { +// getVariantBuilder(block).forAllStates(state -> ConfiguredModel.builder().modelFile(stairsBlock(block, texture)).build()); +// } + private void buildCrystal(Block block, String name) { MultiPartBlockStateBuilder builder = getMultipartBuilder(block); diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBlockTags.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBlockTags.java index f861928c..fc11c13e 100644 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBlockTags.java +++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorBlockTags.java @@ -4,9 +4,11 @@ import java.nio.file.Path; import net.minecraft.data.BlockTagsProvider; import net.minecraft.data.DataGenerator; +import net.minecraft.tags.BlockTags; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.data.ExistingFileHelper; import wayoftime.bloodmagic.BloodMagic; +import wayoftime.bloodmagic.common.block.BloodMagicBlocks; public class GeneratorBlockTags extends BlockTagsProvider { @@ -18,6 +20,8 @@ public class GeneratorBlockTags extends BlockTagsProvider @Override public void registerTags() { + this.getOrCreateBuilder(BlockTags.WALLS).add(BloodMagicBlocks.DUNGEON_BRICK_WALL.get()); + this.getOrCreateBuilder(BlockTags.WALLS).add(BloodMagicBlocks.DUNGEON_POLISHED_WALL.get()); } /** diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemModels.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemModels.java index 280b2432..d4c507f2 100644 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemModels.java +++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemModels.java @@ -36,6 +36,11 @@ public class GeneratorItemModels extends ItemModelProvider registerBlockModel(block.get()); } + for (RegistryObject block : BloodMagicBlocks.DUNGEONBLOCKS.getEntries()) + { + registerBlockModel(block.get()); + } + registerBlockModel(BloodMagicBlocks.BLANK_RITUAL_STONE.get()); registerBlockModel(BloodMagicBlocks.AIR_RITUAL_STONE.get()); registerBlockModel(BloodMagicBlocks.WATER_RITUAL_STONE.get()); @@ -51,6 +56,18 @@ public class GeneratorItemModels extends ItemModelProvider registerCustomBlockPath(BloodMagicBlocks.VENGEFUL_CRYSTAL_BLOCK.get(), "crystal/vengefulcrystal1"); registerCustomBlockPath(BloodMagicBlocks.STEADFAST_CRYSTAL_BLOCK.get(), "crystal/steadfastcrystal1"); + registerCustomBlockPath(BloodMagicBlocks.DUNGEON_BRICK_ASSORTED.get(), "dungeon_brick1"); + registerBlockModel(BloodMagicBlocks.DUNGEON_STONE.get()); + registerBlockModel(BloodMagicBlocks.DUNGEON_BRICK_STAIRS.get()); + registerBlockModel(BloodMagicBlocks.DUNGEON_POLISHED_STAIRS.get()); + registerBlockModel(BloodMagicBlocks.DUNGEON_PILLAR_CENTER.get()); + registerBlockModel(BloodMagicBlocks.DUNGEON_PILLAR_SPECIAL.get()); + registerBlockModel(BloodMagicBlocks.DUNGEON_PILLAR_CAP.get()); + registerCustomBlockPath(BloodMagicBlocks.DUNGEON_BRICK_WALL.get(), "dungeon_brick_wall_inventory"); + registerCustomBlockPath(BloodMagicBlocks.DUNGEON_POLISHED_WALL.get(), "dungeon_polished_wall_inventory"); + registerBlockModel(BloodMagicBlocks.DUNGEON_BRICK_GATE.get()); + registerBlockModel(BloodMagicBlocks.DUNGEON_POLISHED_GATE.get()); + registerToggleableItem(BloodMagicItems.GREEN_GROVE_SIGIL.get()); registerToggleableItem(BloodMagicItems.FAST_MINER_SIGIL.get()); registerToggleableItem(BloodMagicItems.MAGNETISM_SIGIL.get()); @@ -64,6 +81,7 @@ public class GeneratorItemModels extends ItemModelProvider registerDemonTool(BloodMagicItems.SENTIENT_PICKAXE.get()); registerDemonTool(BloodMagicItems.SENTIENT_SHOVEL.get()); registerSacrificialKnife(BloodMagicItems.SACRIFICIAL_DAGGER.get()); + } private void registerCustomBlockPath(Block block, String newPath) diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemTags.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemTags.java index 7eeae0be..8a6377ad 100644 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemTags.java +++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorItemTags.java @@ -51,6 +51,7 @@ public class GeneratorItemTags extends ItemTagsProvider this.getOrCreateBuilder(BloodMagicTags.CRYSTAL_DEMON).add(BloodMagicItems.DESTRUCTIVE_CRYSTAL.get()); this.getOrCreateBuilder(BloodMagicTags.CRYSTAL_DEMON).add(BloodMagicItems.VENGEFUL_CRYSTAL.get()); this.getOrCreateBuilder(BloodMagicTags.CRYSTAL_DEMON).add(BloodMagicItems.STEADFAST_CRYSTAL.get()); + // this.getOrCreateBuilder(GOORESISTANT).addTag(BlockTags.DOORS); // this.getOrCreateBuilder(GOORESISTANT).addTag(BlockTags.BEDS); // this.getOrCreateBuilder(GOORESISTANT).add(Blocks.PISTON, Blocks.PISTON_HEAD, Blocks.STICKY_PISTON, Blocks.MOVING_PISTON); diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java index 492b17cc..991329f5 100644 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java +++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLanguage.java @@ -341,6 +341,31 @@ public class GeneratorLanguage extends LanguageProvider addBlock(BloodMagicBlocks.OBSIDIAN_PATH, "Obsidian Path"); addBlock(BloodMagicBlocks.OBSIDIAN_TILE_PATH, "Tiled Obsidian Path"); + addBlock(BloodMagicBlocks.DUNGEON_BRICK_1, "Demon Bricks"); + addBlock(BloodMagicBlocks.DUNGEON_BRICK_2, "Offset Demon Bricks"); + addBlock(BloodMagicBlocks.DUNGEON_BRICK_3, "Long Demon Bricks"); + addBlock(BloodMagicBlocks.DUNGEON_SMALL_BRICK, "Small Demon Bricks"); + addBlock(BloodMagicBlocks.DUNGEON_BRICK_ASSORTED, "Assorted Demon Bricks"); + + addBlock(BloodMagicBlocks.DUNGEON_STONE, "Demon Stone"); + addBlock(BloodMagicBlocks.DUNGEON_POLISHED_STONE, "Polished Demon Stone"); + addBlock(BloodMagicBlocks.DUNGEON_TILE, "Demon Stone Tiles"); + addBlock(BloodMagicBlocks.DUNGEON_TILE_SPECIAL, "Accented Demon Stone Tiles"); + + addBlock(BloodMagicBlocks.DUNGEON_BRICK_GATE, "Demon Brick Gate"); + addBlock(BloodMagicBlocks.DUNGEON_POLISHED_GATE, "Demon Stone Gate"); + + addBlock(BloodMagicBlocks.DUNGEON_BRICK_STAIRS, "Demon Brick Stairs"); + addBlock(BloodMagicBlocks.DUNGEON_POLISHED_STAIRS, "Demon Stone Stairs"); + + addBlock(BloodMagicBlocks.DUNGEON_BRICK_WALL, "Demon Brick Wall"); + addBlock(BloodMagicBlocks.DUNGEON_POLISHED_WALL, "Demon Stone Wall"); + + addBlock(BloodMagicBlocks.DUNGEON_PILLAR_CAP, "Demon Stone Pillar Cap"); + addBlock(BloodMagicBlocks.DUNGEON_PILLAR_CENTER, "Demon Stone Pillar"); + addBlock(BloodMagicBlocks.DUNGEON_PILLAR_SPECIAL, "Accented Demon Stone Pillar"); + addBlock(BloodMagicBlocks.DUNGEON_EYE, "Demon Eye"); + // Item names addItem(BloodMagicItems.WEAK_BLOOD_ORB, "Weak Blood Orb"); addItem(BloodMagicItems.APPRENTICE_BLOOD_ORB, "Apprentice Blood Orb"); diff --git a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLootTable.java b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLootTable.java index 4275e10b..49828bea 100644 --- a/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLootTable.java +++ b/src/main/java/wayoftime/bloodmagic/common/data/GeneratorLootTable.java @@ -60,6 +60,11 @@ public class GeneratorLootTable extends LootTableProvider this.registerDropSelfLootTable(block.get()); } + for (RegistryObject block : BloodMagicBlocks.DUNGEONBLOCKS.getEntries()) + { + this.registerDropSelfLootTable(block.get()); + } + registerDropSelfLootTable(BloodMagicBlocks.BLOOD_ALTAR.get()); registerNoDropLootTable(BloodMagicBlocks.ALCHEMY_ARRAY.get()); registerNoDropLootTable(BloodMagicBlocks.BLOOD_LIGHT.get()); @@ -83,6 +88,18 @@ public class GeneratorLootTable extends LootTableProvider registerDropCrystalsLootTable(BloodMagicBlocks.DESTRUCTIVE_CRYSTAL_BLOCK.get(), BloodMagicItems.DESTRUCTIVE_CRYSTAL.get()); registerDropCrystalsLootTable(BloodMagicBlocks.VENGEFUL_CRYSTAL_BLOCK.get(), BloodMagicItems.VENGEFUL_CRYSTAL.get()); registerDropCrystalsLootTable(BloodMagicBlocks.STEADFAST_CRYSTAL_BLOCK.get(), BloodMagicItems.STEADFAST_CRYSTAL.get()); + + registerDropSelfLootTable(BloodMagicBlocks.DUNGEON_BRICK_ASSORTED.get()); + registerDropSelfLootTable(BloodMagicBlocks.DUNGEON_STONE.get()); + registerDropSelfLootTable(BloodMagicBlocks.DUNGEON_BRICK_STAIRS.get()); + registerDropSelfLootTable(BloodMagicBlocks.DUNGEON_POLISHED_STAIRS.get()); + registerDropSelfLootTable(BloodMagicBlocks.DUNGEON_PILLAR_CENTER.get()); + registerDropSelfLootTable(BloodMagicBlocks.DUNGEON_PILLAR_SPECIAL.get()); + registerDropSelfLootTable(BloodMagicBlocks.DUNGEON_PILLAR_CAP.get()); + registerDropSelfLootTable(BloodMagicBlocks.DUNGEON_BRICK_WALL.get()); + registerDropSelfLootTable(BloodMagicBlocks.DUNGEON_POLISHED_WALL.get()); + registerDropSelfLootTable(BloodMagicBlocks.DUNGEON_BRICK_GATE.get()); + registerDropSelfLootTable(BloodMagicBlocks.DUNGEON_POLISHED_GATE.get()); } private void registerNoDropLootTable(Block block) diff --git a/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java b/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java index 4bccc371..bedc581c 100644 --- a/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java +++ b/src/main/java/wayoftime/bloodmagic/common/item/BloodMagicItems.java @@ -210,4 +210,25 @@ public class BloodMagicItems public static final RegistryObject GOLD_SAND = BASICITEMS.register("goldsand", () -> new ItemBase()); public static final RegistryObject COAL_SAND = BASICITEMS.register("coalsand", () -> new ItemBase()); + // Dungeons + public static final RegistryObject DUNGEON_BRICK_1_BLOCK = ITEMS.register("dungeon_brick1", () -> new BlockItem(BloodMagicBlocks.DUNGEON_BRICK_1.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject DUNGEON_BRICK_2_BLOCK = ITEMS.register("dungeon_brick2", () -> new BlockItem(BloodMagicBlocks.DUNGEON_BRICK_2.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject DUNGEON_BRICK_3_BLOCK = ITEMS.register("dungeon_brick3", () -> new BlockItem(BloodMagicBlocks.DUNGEON_BRICK_3.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject DUNGEON_BRICK_ASSORTED_BLOCK = ITEMS.register("dungeon_brick_assorted", () -> new BlockItem(BloodMagicBlocks.DUNGEON_BRICK_ASSORTED.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject DUNGEON_STONE_BLOCK = ITEMS.register("dungeon_stone", () -> new BlockItem(BloodMagicBlocks.DUNGEON_STONE.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject DUNGEON_EYE = ITEMS.register("dungeon_eye", () -> new BlockItem(BloodMagicBlocks.DUNGEON_EYE.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject DUNGEON_POLISHED_STONE_BLOCK = ITEMS.register("dungeon_polished", () -> new BlockItem(BloodMagicBlocks.DUNGEON_POLISHED_STONE.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject DUNGEON_TILE_BLOCK = ITEMS.register("dungeon_tile", () -> new BlockItem(BloodMagicBlocks.DUNGEON_TILE.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject DUNGEON_TILE_SPECIAL_BLOCK = ITEMS.register("dungeon_tilespecial", () -> new BlockItem(BloodMagicBlocks.DUNGEON_TILE_SPECIAL.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject DUNGEON_SMALL_BRICK_BLOCK = ITEMS.register("dungeon_smallbrick", () -> new BlockItem(BloodMagicBlocks.DUNGEON_SMALL_BRICK.get(), new Item.Properties().group(BloodMagic.TAB))); + + public static final RegistryObject DUNGEON_BRICK_STAIRS_BLOCK = ITEMS.register("dungeon_brick_stairs", () -> new BlockItem(BloodMagicBlocks.DUNGEON_BRICK_STAIRS.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject DUNGEON_POLISHED_STAIRS_BLOCK = ITEMS.register("dungeon_polished_stairs", () -> new BlockItem(BloodMagicBlocks.DUNGEON_POLISHED_STAIRS.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject DUNGEON_PILLAR_CENTER_BLOCK = ITEMS.register("dungeon_pillar_center", () -> new BlockItem(BloodMagicBlocks.DUNGEON_PILLAR_CENTER.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject DUNGEON_PILLAR_SPECIAL_BLOCK = ITEMS.register("dungeon_pillar_special", () -> new BlockItem(BloodMagicBlocks.DUNGEON_PILLAR_SPECIAL.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject DUNGEON_PILLAR_CAP_BLOCK = ITEMS.register("dungeon_pillar_cap", () -> new BlockItem(BloodMagicBlocks.DUNGEON_PILLAR_CAP.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject DUNGEON_BRICK_WALL_BLOCK = ITEMS.register("dungeon_brick_wall", () -> new BlockItem(BloodMagicBlocks.DUNGEON_BRICK_WALL.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject DUNGEON_POLISHED_WALL_BLOCK = ITEMS.register("dungeon_polished_wall", () -> new BlockItem(BloodMagicBlocks.DUNGEON_POLISHED_WALL.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject DUNGEON_BRICK_GATE_BLOCK = ITEMS.register("dungeon_brick_gate", () -> new BlockItem(BloodMagicBlocks.DUNGEON_BRICK_GATE.get(), new Item.Properties().group(BloodMagic.TAB))); + public static final RegistryObject DUNGEON_POLISHED_GATE_BLOCK = ITEMS.register("dungeon_polished_gate", () -> new BlockItem(BloodMagicBlocks.DUNGEON_POLISHED_GATE.get(), new Item.Properties().group(BloodMagic.TAB))); }