diff --git a/src/generated/resources/assets/vampirism/blockstates/bloody_dark_stone_bricks.json b/src/generated/resources/assets/vampirism/blockstates/bloody_dark_stone_bricks.json new file mode 100644 index 0000000000..465907ac94 --- /dev/null +++ b/src/generated/resources/assets/vampirism/blockstates/bloody_dark_stone_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "vampirism:block/bloody_dark_stone_bricks" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/blockstates/castle_block_dark_brick.json b/src/generated/resources/assets/vampirism/blockstates/castle_block_dark_brick.json deleted file mode 100644 index a80708f01a..0000000000 --- a/src/generated/resources/assets/vampirism/blockstates/castle_block_dark_brick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "vampirism:block/castle_block_dark_brick" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/blockstates/castle_block_dark_brick_bloody.json b/src/generated/resources/assets/vampirism/blockstates/castle_block_dark_brick_bloody.json deleted file mode 100644 index 309b7aa83a..0000000000 --- a/src/generated/resources/assets/vampirism/blockstates/castle_block_dark_brick_bloody.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "vampirism:block/castle_block_dark_brick_bloody" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/blockstates/castle_block_dark_brick_cracked.json b/src/generated/resources/assets/vampirism/blockstates/castle_block_dark_brick_cracked.json deleted file mode 100644 index 9bcca69e6a..0000000000 --- a/src/generated/resources/assets/vampirism/blockstates/castle_block_dark_brick_cracked.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "vampirism:block/castle_block_dark_brick_cracked" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/blockstates/castle_block_dark_stone.json b/src/generated/resources/assets/vampirism/blockstates/castle_block_dark_stone.json deleted file mode 100644 index 1e4607a060..0000000000 --- a/src/generated/resources/assets/vampirism/blockstates/castle_block_dark_stone.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "vampirism:block/castle_block_dark_stone" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/blockstates/castle_block_normal_brick.json b/src/generated/resources/assets/vampirism/blockstates/castle_block_normal_brick.json deleted file mode 100644 index 5f17fcf789..0000000000 --- a/src/generated/resources/assets/vampirism/blockstates/castle_block_normal_brick.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "vampirism:block/castle_block_normal_brick" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/blockstates/castle_slab_dark_brick.json b/src/generated/resources/assets/vampirism/blockstates/castle_slab_dark_brick.json deleted file mode 100644 index 958ed4d195..0000000000 --- a/src/generated/resources/assets/vampirism/blockstates/castle_slab_dark_brick.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "vampirism:block/castle_slab_dark_brick" - }, - "type=double": { - "model": "vampirism:block/castle_block_dark_brick" - }, - "type=top": { - "model": "vampirism:block/castle_slab_dark_brick_top" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/blockstates/castle_slab_dark_stone.json b/src/generated/resources/assets/vampirism/blockstates/castle_slab_dark_stone.json deleted file mode 100644 index 7f58ff945e..0000000000 --- a/src/generated/resources/assets/vampirism/blockstates/castle_slab_dark_stone.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "vampirism:block/castle_slab_dark_stone" - }, - "type=double": { - "model": "vampirism:block/castle_block_dark_stone" - }, - "type=top": { - "model": "vampirism:block/castle_slab_dark_stone_top" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/blockstates/chiseled_dark_stone_bricks.json b/src/generated/resources/assets/vampirism/blockstates/chiseled_dark_stone_bricks.json new file mode 100644 index 0000000000..407eb67233 --- /dev/null +++ b/src/generated/resources/assets/vampirism/blockstates/chiseled_dark_stone_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "vampirism:block/chiseled_dark_stone_bricks" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/blockstates/cobbled_dark_stone.json b/src/generated/resources/assets/vampirism/blockstates/cobbled_dark_stone.json new file mode 100644 index 0000000000..0f4993cae1 --- /dev/null +++ b/src/generated/resources/assets/vampirism/blockstates/cobbled_dark_stone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "vampirism:block/cobbled_dark_stone" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/blockstates/cobbled_dark_stone_slab.json b/src/generated/resources/assets/vampirism/blockstates/cobbled_dark_stone_slab.json new file mode 100644 index 0000000000..7fc75ff1a5 --- /dev/null +++ b/src/generated/resources/assets/vampirism/blockstates/cobbled_dark_stone_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "vampirism:block/cobbled_dark_stone_slab" + }, + "type=double": { + "model": "vampirism:block/cobbled_dark_stone" + }, + "type=top": { + "model": "vampirism:block/cobbled_dark_stone_slab_top" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/blockstates/cobbled_dark_stone_stairs.json b/src/generated/resources/assets/vampirism/blockstates/cobbled_dark_stone_stairs.json new file mode 100644 index 0000000000..c71bea8dca --- /dev/null +++ b/src/generated/resources/assets/vampirism/blockstates/cobbled_dark_stone_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "vampirism:block/cobbled_dark_stone_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "vampirism:block/cobbled_dark_stone_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "vampirism:block/cobbled_dark_stone_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "vampirism:block/cobbled_dark_stone_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "vampirism:block/cobbled_dark_stone_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "vampirism:block/cobbled_dark_stone_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "vampirism:block/cobbled_dark_stone_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "vampirism:block/cobbled_dark_stone_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "vampirism:block/cobbled_dark_stone_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "vampirism:block/cobbled_dark_stone_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "vampirism:block/cobbled_dark_stone_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "vampirism:block/cobbled_dark_stone_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "vampirism:block/cobbled_dark_stone_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "vampirism:block/cobbled_dark_stone_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "vampirism:block/cobbled_dark_stone_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "vampirism:block/cobbled_dark_stone_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "vampirism:block/cobbled_dark_stone_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "vampirism:block/cobbled_dark_stone_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "vampirism:block/cobbled_dark_stone_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "vampirism:block/cobbled_dark_stone_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "vampirism:block/cobbled_dark_stone_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "vampirism:block/cobbled_dark_stone_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "vampirism:block/cobbled_dark_stone_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "vampirism:block/cobbled_dark_stone_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "vampirism:block/cobbled_dark_stone_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "vampirism:block/cobbled_dark_stone_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "vampirism:block/cobbled_dark_stone_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "vampirism:block/cobbled_dark_stone_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "vampirism:block/cobbled_dark_stone_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "vampirism:block/cobbled_dark_stone_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "vampirism:block/cobbled_dark_stone_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "vampirism:block/cobbled_dark_stone_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "vampirism:block/cobbled_dark_stone_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "vampirism:block/cobbled_dark_stone_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "vampirism:block/cobbled_dark_stone_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "vampirism:block/cobbled_dark_stone_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "vampirism:block/cobbled_dark_stone_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "vampirism:block/cobbled_dark_stone_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "vampirism:block/cobbled_dark_stone_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "vampirism:block/cobbled_dark_stone_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/blockstates/castle_block_dark_brick_wall.json b/src/generated/resources/assets/vampirism/blockstates/cobbled_dark_stone_wall.json similarity index 62% rename from src/generated/resources/assets/vampirism/blockstates/castle_block_dark_brick_wall.json rename to src/generated/resources/assets/vampirism/blockstates/cobbled_dark_stone_wall.json index 3f21555057..e8036400b7 100644 --- a/src/generated/resources/assets/vampirism/blockstates/castle_block_dark_brick_wall.json +++ b/src/generated/resources/assets/vampirism/blockstates/cobbled_dark_stone_wall.json @@ -2,7 +2,7 @@ "multipart": [ { "apply": { - "model": "vampirism:block/castle_block_dark_brick_wall_post" + "model": "vampirism:block/cobbled_dark_stone_wall_post" }, "when": { "up": "true" @@ -10,7 +10,7 @@ }, { "apply": { - "model": "vampirism:block/castle_block_dark_brick_wall_side", + "model": "vampirism:block/cobbled_dark_stone_wall_side", "uvlock": true, "y": 90 }, @@ -20,7 +20,7 @@ }, { "apply": { - "model": "vampirism:block/castle_block_dark_brick_wall_side_tall", + "model": "vampirism:block/cobbled_dark_stone_wall_side_tall", "uvlock": true, "y": 90 }, @@ -30,7 +30,7 @@ }, { "apply": { - "model": "vampirism:block/castle_block_dark_brick_wall_side", + "model": "vampirism:block/cobbled_dark_stone_wall_side", "uvlock": true }, "when": { @@ -39,7 +39,7 @@ }, { "apply": { - "model": "vampirism:block/castle_block_dark_brick_wall_side_tall", + "model": "vampirism:block/cobbled_dark_stone_wall_side_tall", "uvlock": true }, "when": { @@ -48,7 +48,7 @@ }, { "apply": { - "model": "vampirism:block/castle_block_dark_brick_wall_side", + "model": "vampirism:block/cobbled_dark_stone_wall_side", "uvlock": true, "y": 180 }, @@ -58,7 +58,7 @@ }, { "apply": { - "model": "vampirism:block/castle_block_dark_brick_wall_side_tall", + "model": "vampirism:block/cobbled_dark_stone_wall_side_tall", "uvlock": true, "y": 180 }, @@ -68,7 +68,7 @@ }, { "apply": { - "model": "vampirism:block/castle_block_dark_brick_wall_side", + "model": "vampirism:block/cobbled_dark_stone_wall_side", "uvlock": true, "y": 270 }, @@ -78,7 +78,7 @@ }, { "apply": { - "model": "vampirism:block/castle_block_dark_brick_wall_side_tall", + "model": "vampirism:block/cobbled_dark_stone_wall_side_tall", "uvlock": true, "y": 270 }, diff --git a/src/generated/resources/assets/vampirism/blockstates/cracked_dark_stone_bricks.json b/src/generated/resources/assets/vampirism/blockstates/cracked_dark_stone_bricks.json new file mode 100644 index 0000000000..8dc30b55c7 --- /dev/null +++ b/src/generated/resources/assets/vampirism/blockstates/cracked_dark_stone_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "vampirism:block/cracked_dark_stone_bricks" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/blockstates/cracked_dark_stone_tiles.json b/src/generated/resources/assets/vampirism/blockstates/cracked_dark_stone_tiles.json new file mode 100644 index 0000000000..821145a1f0 --- /dev/null +++ b/src/generated/resources/assets/vampirism/blockstates/cracked_dark_stone_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "vampirism:block/cracked_dark_stone_tiles" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/blockstates/dark_stone.json b/src/generated/resources/assets/vampirism/blockstates/dark_stone.json new file mode 100644 index 0000000000..d3295fb1e6 --- /dev/null +++ b/src/generated/resources/assets/vampirism/blockstates/dark_stone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "vampirism:block/dark_stone" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/blockstates/dark_stone_brick_slab.json b/src/generated/resources/assets/vampirism/blockstates/dark_stone_brick_slab.json new file mode 100644 index 0000000000..9b4210c15e --- /dev/null +++ b/src/generated/resources/assets/vampirism/blockstates/dark_stone_brick_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "vampirism:block/dark_stone_brick_slab" + }, + "type=double": { + "model": "vampirism:block/dark_stone_bricks" + }, + "type=top": { + "model": "vampirism:block/dark_stone_brick_slab_top" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/blockstates/castle_stairs_dark_brick.json b/src/generated/resources/assets/vampirism/blockstates/dark_stone_brick_stairs.json similarity index 59% rename from src/generated/resources/assets/vampirism/blockstates/castle_stairs_dark_brick.json rename to src/generated/resources/assets/vampirism/blockstates/dark_stone_brick_stairs.json index 5bcbf55f84..4b561de64c 100644 --- a/src/generated/resources/assets/vampirism/blockstates/castle_stairs_dark_brick.json +++ b/src/generated/resources/assets/vampirism/blockstates/dark_stone_brick_stairs.json @@ -1,206 +1,206 @@ { "variants": { "facing=east,half=bottom,shape=inner_left": { - "model": "vampirism:block/castle_stairs_dark_brick_inner", + "model": "vampirism:block/dark_stone_brick_stairs_inner", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=inner_right": { - "model": "vampirism:block/castle_stairs_dark_brick_inner" + "model": "vampirism:block/dark_stone_brick_stairs_inner" }, "facing=east,half=bottom,shape=outer_left": { - "model": "vampirism:block/castle_stairs_dark_brick_outer", + "model": "vampirism:block/dark_stone_brick_stairs_outer", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=outer_right": { - "model": "vampirism:block/castle_stairs_dark_brick_outer" + "model": "vampirism:block/dark_stone_brick_stairs_outer" }, "facing=east,half=bottom,shape=straight": { - "model": "vampirism:block/castle_stairs_dark_brick" + "model": "vampirism:block/dark_stone_brick_stairs" }, "facing=east,half=top,shape=inner_left": { - "model": "vampirism:block/castle_stairs_dark_brick_inner", + "model": "vampirism:block/dark_stone_brick_stairs_inner", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=inner_right": { - "model": "vampirism:block/castle_stairs_dark_brick_inner", + "model": "vampirism:block/dark_stone_brick_stairs_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=outer_left": { - "model": "vampirism:block/castle_stairs_dark_brick_outer", + "model": "vampirism:block/dark_stone_brick_stairs_outer", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=outer_right": { - "model": "vampirism:block/castle_stairs_dark_brick_outer", + "model": "vampirism:block/dark_stone_brick_stairs_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=straight": { - "model": "vampirism:block/castle_stairs_dark_brick", + "model": "vampirism:block/dark_stone_brick_stairs", "uvlock": true, "x": 180 }, "facing=north,half=bottom,shape=inner_left": { - "model": "vampirism:block/castle_stairs_dark_brick_inner", + "model": "vampirism:block/dark_stone_brick_stairs_inner", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=inner_right": { - "model": "vampirism:block/castle_stairs_dark_brick_inner", + "model": "vampirism:block/dark_stone_brick_stairs_inner", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=outer_left": { - "model": "vampirism:block/castle_stairs_dark_brick_outer", + "model": "vampirism:block/dark_stone_brick_stairs_outer", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=outer_right": { - "model": "vampirism:block/castle_stairs_dark_brick_outer", + "model": "vampirism:block/dark_stone_brick_stairs_outer", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=straight": { - "model": "vampirism:block/castle_stairs_dark_brick", + "model": "vampirism:block/dark_stone_brick_stairs", "uvlock": true, "y": 270 }, "facing=north,half=top,shape=inner_left": { - "model": "vampirism:block/castle_stairs_dark_brick_inner", + "model": "vampirism:block/dark_stone_brick_stairs_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=inner_right": { - "model": "vampirism:block/castle_stairs_dark_brick_inner", + "model": "vampirism:block/dark_stone_brick_stairs_inner", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=outer_left": { - "model": "vampirism:block/castle_stairs_dark_brick_outer", + "model": "vampirism:block/dark_stone_brick_stairs_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=outer_right": { - "model": "vampirism:block/castle_stairs_dark_brick_outer", + "model": "vampirism:block/dark_stone_brick_stairs_outer", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=straight": { - "model": "vampirism:block/castle_stairs_dark_brick", + "model": "vampirism:block/dark_stone_brick_stairs", "uvlock": true, "x": 180, "y": 270 }, "facing=south,half=bottom,shape=inner_left": { - "model": "vampirism:block/castle_stairs_dark_brick_inner" + "model": "vampirism:block/dark_stone_brick_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { - "model": "vampirism:block/castle_stairs_dark_brick_inner", + "model": "vampirism:block/dark_stone_brick_stairs_inner", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=outer_left": { - "model": "vampirism:block/castle_stairs_dark_brick_outer" + "model": "vampirism:block/dark_stone_brick_stairs_outer" }, "facing=south,half=bottom,shape=outer_right": { - "model": "vampirism:block/castle_stairs_dark_brick_outer", + "model": "vampirism:block/dark_stone_brick_stairs_outer", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=straight": { - "model": "vampirism:block/castle_stairs_dark_brick", + "model": "vampirism:block/dark_stone_brick_stairs", "uvlock": true, "y": 90 }, "facing=south,half=top,shape=inner_left": { - "model": "vampirism:block/castle_stairs_dark_brick_inner", + "model": "vampirism:block/dark_stone_brick_stairs_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=inner_right": { - "model": "vampirism:block/castle_stairs_dark_brick_inner", + "model": "vampirism:block/dark_stone_brick_stairs_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=outer_left": { - "model": "vampirism:block/castle_stairs_dark_brick_outer", + "model": "vampirism:block/dark_stone_brick_stairs_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=outer_right": { - "model": "vampirism:block/castle_stairs_dark_brick_outer", + "model": "vampirism:block/dark_stone_brick_stairs_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=straight": { - "model": "vampirism:block/castle_stairs_dark_brick", + "model": "vampirism:block/dark_stone_brick_stairs", "uvlock": true, "x": 180, "y": 90 }, "facing=west,half=bottom,shape=inner_left": { - "model": "vampirism:block/castle_stairs_dark_brick_inner", + "model": "vampirism:block/dark_stone_brick_stairs_inner", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=inner_right": { - "model": "vampirism:block/castle_stairs_dark_brick_inner", + "model": "vampirism:block/dark_stone_brick_stairs_inner", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=outer_left": { - "model": "vampirism:block/castle_stairs_dark_brick_outer", + "model": "vampirism:block/dark_stone_brick_stairs_outer", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=outer_right": { - "model": "vampirism:block/castle_stairs_dark_brick_outer", + "model": "vampirism:block/dark_stone_brick_stairs_outer", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=straight": { - "model": "vampirism:block/castle_stairs_dark_brick", + "model": "vampirism:block/dark_stone_brick_stairs", "uvlock": true, "y": 180 }, "facing=west,half=top,shape=inner_left": { - "model": "vampirism:block/castle_stairs_dark_brick_inner", + "model": "vampirism:block/dark_stone_brick_stairs_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=inner_right": { - "model": "vampirism:block/castle_stairs_dark_brick_inner", + "model": "vampirism:block/dark_stone_brick_stairs_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=outer_left": { - "model": "vampirism:block/castle_stairs_dark_brick_outer", + "model": "vampirism:block/dark_stone_brick_stairs_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=outer_right": { - "model": "vampirism:block/castle_stairs_dark_brick_outer", + "model": "vampirism:block/dark_stone_brick_stairs_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=straight": { - "model": "vampirism:block/castle_stairs_dark_brick", + "model": "vampirism:block/dark_stone_brick_stairs", "uvlock": true, "x": 180, "y": 180 diff --git a/src/generated/resources/assets/vampirism/blockstates/dark_stone_brick_wall.json b/src/generated/resources/assets/vampirism/blockstates/dark_stone_brick_wall.json new file mode 100644 index 0000000000..183992bdc1 --- /dev/null +++ b/src/generated/resources/assets/vampirism/blockstates/dark_stone_brick_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "vampirism:block/dark_stone_brick_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "vampirism:block/dark_stone_brick_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "vampirism:block/dark_stone_brick_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "vampirism:block/dark_stone_brick_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "vampirism:block/dark_stone_brick_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "vampirism:block/dark_stone_brick_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "vampirism:block/dark_stone_brick_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "vampirism:block/dark_stone_brick_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "vampirism:block/dark_stone_brick_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/blockstates/dark_stone_bricks.json b/src/generated/resources/assets/vampirism/blockstates/dark_stone_bricks.json new file mode 100644 index 0000000000..0721aebc57 --- /dev/null +++ b/src/generated/resources/assets/vampirism/blockstates/dark_stone_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "vampirism:block/dark_stone_bricks" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/blockstates/dark_stone_slab.json b/src/generated/resources/assets/vampirism/blockstates/dark_stone_slab.json new file mode 100644 index 0000000000..6f8856a612 --- /dev/null +++ b/src/generated/resources/assets/vampirism/blockstates/dark_stone_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "vampirism:block/dark_stone_slab" + }, + "type=double": { + "model": "vampirism:block/dark_stone" + }, + "type=top": { + "model": "vampirism:block/dark_stone_slab_top" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/blockstates/castle_stairs_dark_stone.json b/src/generated/resources/assets/vampirism/blockstates/dark_stone_stairs.json similarity index 59% rename from src/generated/resources/assets/vampirism/blockstates/castle_stairs_dark_stone.json rename to src/generated/resources/assets/vampirism/blockstates/dark_stone_stairs.json index d630139259..d60c34f7c2 100644 --- a/src/generated/resources/assets/vampirism/blockstates/castle_stairs_dark_stone.json +++ b/src/generated/resources/assets/vampirism/blockstates/dark_stone_stairs.json @@ -1,206 +1,206 @@ { "variants": { "facing=east,half=bottom,shape=inner_left": { - "model": "vampirism:block/castle_stairs_dark_stone_inner", + "model": "vampirism:block/dark_stone_stairs_inner", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=inner_right": { - "model": "vampirism:block/castle_stairs_dark_stone_inner" + "model": "vampirism:block/dark_stone_stairs_inner" }, "facing=east,half=bottom,shape=outer_left": { - "model": "vampirism:block/castle_stairs_dark_stone_outer", + "model": "vampirism:block/dark_stone_stairs_outer", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=outer_right": { - "model": "vampirism:block/castle_stairs_dark_stone_outer" + "model": "vampirism:block/dark_stone_stairs_outer" }, "facing=east,half=bottom,shape=straight": { - "model": "vampirism:block/castle_stairs_dark_stone" + "model": "vampirism:block/dark_stone_stairs" }, "facing=east,half=top,shape=inner_left": { - "model": "vampirism:block/castle_stairs_dark_stone_inner", + "model": "vampirism:block/dark_stone_stairs_inner", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=inner_right": { - "model": "vampirism:block/castle_stairs_dark_stone_inner", + "model": "vampirism:block/dark_stone_stairs_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=outer_left": { - "model": "vampirism:block/castle_stairs_dark_stone_outer", + "model": "vampirism:block/dark_stone_stairs_outer", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=outer_right": { - "model": "vampirism:block/castle_stairs_dark_stone_outer", + "model": "vampirism:block/dark_stone_stairs_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=straight": { - "model": "vampirism:block/castle_stairs_dark_stone", + "model": "vampirism:block/dark_stone_stairs", "uvlock": true, "x": 180 }, "facing=north,half=bottom,shape=inner_left": { - "model": "vampirism:block/castle_stairs_dark_stone_inner", + "model": "vampirism:block/dark_stone_stairs_inner", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=inner_right": { - "model": "vampirism:block/castle_stairs_dark_stone_inner", + "model": "vampirism:block/dark_stone_stairs_inner", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=outer_left": { - "model": "vampirism:block/castle_stairs_dark_stone_outer", + "model": "vampirism:block/dark_stone_stairs_outer", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=outer_right": { - "model": "vampirism:block/castle_stairs_dark_stone_outer", + "model": "vampirism:block/dark_stone_stairs_outer", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=straight": { - "model": "vampirism:block/castle_stairs_dark_stone", + "model": "vampirism:block/dark_stone_stairs", "uvlock": true, "y": 270 }, "facing=north,half=top,shape=inner_left": { - "model": "vampirism:block/castle_stairs_dark_stone_inner", + "model": "vampirism:block/dark_stone_stairs_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=inner_right": { - "model": "vampirism:block/castle_stairs_dark_stone_inner", + "model": "vampirism:block/dark_stone_stairs_inner", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=outer_left": { - "model": "vampirism:block/castle_stairs_dark_stone_outer", + "model": "vampirism:block/dark_stone_stairs_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=outer_right": { - "model": "vampirism:block/castle_stairs_dark_stone_outer", + "model": "vampirism:block/dark_stone_stairs_outer", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=straight": { - "model": "vampirism:block/castle_stairs_dark_stone", + "model": "vampirism:block/dark_stone_stairs", "uvlock": true, "x": 180, "y": 270 }, "facing=south,half=bottom,shape=inner_left": { - "model": "vampirism:block/castle_stairs_dark_stone_inner" + "model": "vampirism:block/dark_stone_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { - "model": "vampirism:block/castle_stairs_dark_stone_inner", + "model": "vampirism:block/dark_stone_stairs_inner", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=outer_left": { - "model": "vampirism:block/castle_stairs_dark_stone_outer" + "model": "vampirism:block/dark_stone_stairs_outer" }, "facing=south,half=bottom,shape=outer_right": { - "model": "vampirism:block/castle_stairs_dark_stone_outer", + "model": "vampirism:block/dark_stone_stairs_outer", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=straight": { - "model": "vampirism:block/castle_stairs_dark_stone", + "model": "vampirism:block/dark_stone_stairs", "uvlock": true, "y": 90 }, "facing=south,half=top,shape=inner_left": { - "model": "vampirism:block/castle_stairs_dark_stone_inner", + "model": "vampirism:block/dark_stone_stairs_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=inner_right": { - "model": "vampirism:block/castle_stairs_dark_stone_inner", + "model": "vampirism:block/dark_stone_stairs_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=outer_left": { - "model": "vampirism:block/castle_stairs_dark_stone_outer", + "model": "vampirism:block/dark_stone_stairs_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=outer_right": { - "model": "vampirism:block/castle_stairs_dark_stone_outer", + "model": "vampirism:block/dark_stone_stairs_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=straight": { - "model": "vampirism:block/castle_stairs_dark_stone", + "model": "vampirism:block/dark_stone_stairs", "uvlock": true, "x": 180, "y": 90 }, "facing=west,half=bottom,shape=inner_left": { - "model": "vampirism:block/castle_stairs_dark_stone_inner", + "model": "vampirism:block/dark_stone_stairs_inner", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=inner_right": { - "model": "vampirism:block/castle_stairs_dark_stone_inner", + "model": "vampirism:block/dark_stone_stairs_inner", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=outer_left": { - "model": "vampirism:block/castle_stairs_dark_stone_outer", + "model": "vampirism:block/dark_stone_stairs_outer", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=outer_right": { - "model": "vampirism:block/castle_stairs_dark_stone_outer", + "model": "vampirism:block/dark_stone_stairs_outer", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=straight": { - "model": "vampirism:block/castle_stairs_dark_stone", + "model": "vampirism:block/dark_stone_stairs", "uvlock": true, "y": 180 }, "facing=west,half=top,shape=inner_left": { - "model": "vampirism:block/castle_stairs_dark_stone_inner", + "model": "vampirism:block/dark_stone_stairs_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=inner_right": { - "model": "vampirism:block/castle_stairs_dark_stone_inner", + "model": "vampirism:block/dark_stone_stairs_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=outer_left": { - "model": "vampirism:block/castle_stairs_dark_stone_outer", + "model": "vampirism:block/dark_stone_stairs_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=outer_right": { - "model": "vampirism:block/castle_stairs_dark_stone_outer", + "model": "vampirism:block/dark_stone_stairs_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=straight": { - "model": "vampirism:block/castle_stairs_dark_stone", + "model": "vampirism:block/dark_stone_stairs", "uvlock": true, "x": 180, "y": 180 diff --git a/src/generated/resources/assets/vampirism/blockstates/dark_stone_tiles.json b/src/generated/resources/assets/vampirism/blockstates/dark_stone_tiles.json new file mode 100644 index 0000000000..7def2abed1 --- /dev/null +++ b/src/generated/resources/assets/vampirism/blockstates/dark_stone_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "vampirism:block/dark_stone_tiles" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/blockstates/dark_stone_tiles_slab.json b/src/generated/resources/assets/vampirism/blockstates/dark_stone_tiles_slab.json new file mode 100644 index 0000000000..d90ba59f20 --- /dev/null +++ b/src/generated/resources/assets/vampirism/blockstates/dark_stone_tiles_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "vampirism:block/dark_stone_tiles_slab" + }, + "type=double": { + "model": "vampirism:block/dark_stone_tiles" + }, + "type=top": { + "model": "vampirism:block/dark_stone_tiles_slab_top" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/blockstates/dark_stone_tiles_stairs.json b/src/generated/resources/assets/vampirism/blockstates/dark_stone_tiles_stairs.json new file mode 100644 index 0000000000..2500ed0ae1 --- /dev/null +++ b/src/generated/resources/assets/vampirism/blockstates/dark_stone_tiles_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "vampirism:block/dark_stone_tiles_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "vampirism:block/dark_stone_tiles_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "vampirism:block/dark_stone_tiles_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "vampirism:block/dark_stone_tiles_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "vampirism:block/dark_stone_tiles_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "vampirism:block/dark_stone_tiles_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "vampirism:block/dark_stone_tiles_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "vampirism:block/dark_stone_tiles_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "vampirism:block/dark_stone_tiles_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "vampirism:block/dark_stone_tiles_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "vampirism:block/dark_stone_tiles_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "vampirism:block/dark_stone_tiles_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "vampirism:block/dark_stone_tiles_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "vampirism:block/dark_stone_tiles_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "vampirism:block/dark_stone_tiles_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "vampirism:block/dark_stone_tiles_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "vampirism:block/dark_stone_tiles_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "vampirism:block/dark_stone_tiles_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "vampirism:block/dark_stone_tiles_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "vampirism:block/dark_stone_tiles_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "vampirism:block/dark_stone_tiles_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "vampirism:block/dark_stone_tiles_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "vampirism:block/dark_stone_tiles_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "vampirism:block/dark_stone_tiles_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "vampirism:block/dark_stone_tiles_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "vampirism:block/dark_stone_tiles_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "vampirism:block/dark_stone_tiles_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "vampirism:block/dark_stone_tiles_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "vampirism:block/dark_stone_tiles_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "vampirism:block/dark_stone_tiles_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "vampirism:block/dark_stone_tiles_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "vampirism:block/dark_stone_tiles_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "vampirism:block/dark_stone_tiles_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "vampirism:block/dark_stone_tiles_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "vampirism:block/dark_stone_tiles_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "vampirism:block/dark_stone_tiles_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "vampirism:block/dark_stone_tiles_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "vampirism:block/dark_stone_tiles_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "vampirism:block/dark_stone_tiles_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "vampirism:block/dark_stone_tiles_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/blockstates/dark_stone_tiles_wall.json b/src/generated/resources/assets/vampirism/blockstates/dark_stone_tiles_wall.json new file mode 100644 index 0000000000..f622e55d44 --- /dev/null +++ b/src/generated/resources/assets/vampirism/blockstates/dark_stone_tiles_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "vampirism:block/dark_stone_tiles_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "vampirism:block/dark_stone_tiles_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "vampirism:block/dark_stone_tiles_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "vampirism:block/dark_stone_tiles_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "vampirism:block/dark_stone_tiles_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "vampirism:block/dark_stone_tiles_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "vampirism:block/dark_stone_tiles_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "vampirism:block/dark_stone_tiles_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "vampirism:block/dark_stone_tiles_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/blockstates/dark_stone_wall.json b/src/generated/resources/assets/vampirism/blockstates/dark_stone_wall.json new file mode 100644 index 0000000000..42ae5244d5 --- /dev/null +++ b/src/generated/resources/assets/vampirism/blockstates/dark_stone_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "vampirism:block/dark_stone_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "vampirism:block/dark_stone_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "vampirism:block/dark_stone_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "vampirism:block/dark_stone_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "vampirism:block/dark_stone_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "vampirism:block/dark_stone_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "vampirism:block/dark_stone_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "vampirism:block/dark_stone_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "vampirism:block/dark_stone_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/blockstates/infested_dark_stone.json b/src/generated/resources/assets/vampirism/blockstates/infested_dark_stone.json new file mode 100644 index 0000000000..d3295fb1e6 --- /dev/null +++ b/src/generated/resources/assets/vampirism/blockstates/infested_dark_stone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "vampirism:block/dark_stone" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/blockstates/polished_dark_stone.json b/src/generated/resources/assets/vampirism/blockstates/polished_dark_stone.json new file mode 100644 index 0000000000..4ff3927759 --- /dev/null +++ b/src/generated/resources/assets/vampirism/blockstates/polished_dark_stone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "vampirism:block/polished_dark_stone" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/blockstates/polished_dark_stone_slab.json b/src/generated/resources/assets/vampirism/blockstates/polished_dark_stone_slab.json new file mode 100644 index 0000000000..fd4d855200 --- /dev/null +++ b/src/generated/resources/assets/vampirism/blockstates/polished_dark_stone_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "vampirism:block/polished_dark_stone_slab" + }, + "type=double": { + "model": "vampirism:block/polished_dark_stone" + }, + "type=top": { + "model": "vampirism:block/polished_dark_stone_slab_top" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/blockstates/polished_dark_stone_stairs.json b/src/generated/resources/assets/vampirism/blockstates/polished_dark_stone_stairs.json new file mode 100644 index 0000000000..1f9d26bff6 --- /dev/null +++ b/src/generated/resources/assets/vampirism/blockstates/polished_dark_stone_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "vampirism:block/polished_dark_stone_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "vampirism:block/polished_dark_stone_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "vampirism:block/polished_dark_stone_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "vampirism:block/polished_dark_stone_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "vampirism:block/polished_dark_stone_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "vampirism:block/polished_dark_stone_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "vampirism:block/polished_dark_stone_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "vampirism:block/polished_dark_stone_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "vampirism:block/polished_dark_stone_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "vampirism:block/polished_dark_stone_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "vampirism:block/polished_dark_stone_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "vampirism:block/polished_dark_stone_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "vampirism:block/polished_dark_stone_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "vampirism:block/polished_dark_stone_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "vampirism:block/polished_dark_stone_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "vampirism:block/polished_dark_stone_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "vampirism:block/polished_dark_stone_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "vampirism:block/polished_dark_stone_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "vampirism:block/polished_dark_stone_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "vampirism:block/polished_dark_stone_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "vampirism:block/polished_dark_stone_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "vampirism:block/polished_dark_stone_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "vampirism:block/polished_dark_stone_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "vampirism:block/polished_dark_stone_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "vampirism:block/polished_dark_stone_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "vampirism:block/polished_dark_stone_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "vampirism:block/polished_dark_stone_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "vampirism:block/polished_dark_stone_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "vampirism:block/polished_dark_stone_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "vampirism:block/polished_dark_stone_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "vampirism:block/polished_dark_stone_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "vampirism:block/polished_dark_stone_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "vampirism:block/polished_dark_stone_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "vampirism:block/polished_dark_stone_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "vampirism:block/polished_dark_stone_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "vampirism:block/polished_dark_stone_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "vampirism:block/polished_dark_stone_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "vampirism:block/polished_dark_stone_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "vampirism:block/polished_dark_stone_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "vampirism:block/polished_dark_stone_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/blockstates/polished_dark_stone_wall.json b/src/generated/resources/assets/vampirism/blockstates/polished_dark_stone_wall.json new file mode 100644 index 0000000000..aa90c22ce3 --- /dev/null +++ b/src/generated/resources/assets/vampirism/blockstates/polished_dark_stone_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "vampirism:block/polished_dark_stone_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "vampirism:block/polished_dark_stone_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "vampirism:block/polished_dark_stone_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "vampirism:block/polished_dark_stone_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "vampirism:block/polished_dark_stone_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "vampirism:block/polished_dark_stone_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "vampirism:block/polished_dark_stone_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "vampirism:block/polished_dark_stone_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "vampirism:block/polished_dark_stone_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/castle_block_normal_brick.json b/src/generated/resources/assets/vampirism/models/block/bloody_dark_stone_bricks.json similarity index 53% rename from src/generated/resources/assets/vampirism/models/block/castle_block_normal_brick.json rename to src/generated/resources/assets/vampirism/models/block/bloody_dark_stone_bricks.json index 074e114af9..65821034f7 100644 --- a/src/generated/resources/assets/vampirism/models/block/castle_block_normal_brick.json +++ b/src/generated/resources/assets/vampirism/models/block/bloody_dark_stone_bricks.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "vampirism:block/castle_block_normal_brick" + "all": "vampirism:block/bloody_dark_stone_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/castle_block_dark_brick_cracked.json b/src/generated/resources/assets/vampirism/models/block/castle_block_dark_brick_cracked.json deleted file mode 100644 index d40314f5b2..0000000000 --- a/src/generated/resources/assets/vampirism/models/block/castle_block_dark_brick_cracked.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "vampirism:block/castle_block_dark_brick_cracked" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/castle_slab_dark_brick.json b/src/generated/resources/assets/vampirism/models/block/castle_slab_dark_brick.json deleted file mode 100644 index fe486fe9f8..0000000000 --- a/src/generated/resources/assets/vampirism/models/block/castle_slab_dark_brick.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "vampirism:block/castle_block_dark_brick", - "side": "vampirism:block/castle_block_dark_brick", - "top": "vampirism:block/castle_block_dark_brick" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/castle_slab_dark_brick_top.json b/src/generated/resources/assets/vampirism/models/block/castle_slab_dark_brick_top.json deleted file mode 100644 index bc39d08d53..0000000000 --- a/src/generated/resources/assets/vampirism/models/block/castle_slab_dark_brick_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "vampirism:block/castle_block_dark_brick", - "side": "vampirism:block/castle_block_dark_brick", - "top": "vampirism:block/castle_block_dark_brick" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/castle_slab_dark_stone.json b/src/generated/resources/assets/vampirism/models/block/castle_slab_dark_stone.json deleted file mode 100644 index b514e7d6f2..0000000000 --- a/src/generated/resources/assets/vampirism/models/block/castle_slab_dark_stone.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "vampirism:block/castle_block_dark_stone", - "side": "vampirism:block/castle_block_dark_stone", - "top": "vampirism:block/castle_block_dark_stone" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/castle_slab_dark_stone_top.json b/src/generated/resources/assets/vampirism/models/block/castle_slab_dark_stone_top.json deleted file mode 100644 index 1f87d57be5..0000000000 --- a/src/generated/resources/assets/vampirism/models/block/castle_slab_dark_stone_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "vampirism:block/castle_block_dark_stone", - "side": "vampirism:block/castle_block_dark_stone", - "top": "vampirism:block/castle_block_dark_stone" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/castle_stairs_dark_brick.json b/src/generated/resources/assets/vampirism/models/block/castle_stairs_dark_brick.json deleted file mode 100644 index 4de5bab1cb..0000000000 --- a/src/generated/resources/assets/vampirism/models/block/castle_stairs_dark_brick.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "vampirism:block/castle_block_dark_brick", - "side": "vampirism:block/castle_block_dark_brick", - "top": "vampirism:block/castle_block_dark_brick" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/castle_stairs_dark_brick_inner.json b/src/generated/resources/assets/vampirism/models/block/castle_stairs_dark_brick_inner.json deleted file mode 100644 index 9bfbe8911f..0000000000 --- a/src/generated/resources/assets/vampirism/models/block/castle_stairs_dark_brick_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "vampirism:block/castle_block_dark_brick", - "side": "vampirism:block/castle_block_dark_brick", - "top": "vampirism:block/castle_block_dark_brick" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/castle_stairs_dark_brick_outer.json b/src/generated/resources/assets/vampirism/models/block/castle_stairs_dark_brick_outer.json deleted file mode 100644 index 244f89926e..0000000000 --- a/src/generated/resources/assets/vampirism/models/block/castle_stairs_dark_brick_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "vampirism:block/castle_block_dark_brick", - "side": "vampirism:block/castle_block_dark_brick", - "top": "vampirism:block/castle_block_dark_brick" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/castle_stairs_dark_stone.json b/src/generated/resources/assets/vampirism/models/block/castle_stairs_dark_stone.json deleted file mode 100644 index b28658f534..0000000000 --- a/src/generated/resources/assets/vampirism/models/block/castle_stairs_dark_stone.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "vampirism:block/castle_block_dark_stone", - "side": "vampirism:block/castle_block_dark_stone", - "top": "vampirism:block/castle_block_dark_stone" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/castle_stairs_dark_stone_inner.json b/src/generated/resources/assets/vampirism/models/block/castle_stairs_dark_stone_inner.json deleted file mode 100644 index 13f3146e2b..0000000000 --- a/src/generated/resources/assets/vampirism/models/block/castle_stairs_dark_stone_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "vampirism:block/castle_block_dark_stone", - "side": "vampirism:block/castle_block_dark_stone", - "top": "vampirism:block/castle_block_dark_stone" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/castle_stairs_dark_stone_outer.json b/src/generated/resources/assets/vampirism/models/block/castle_stairs_dark_stone_outer.json deleted file mode 100644 index a59b4bfcac..0000000000 --- a/src/generated/resources/assets/vampirism/models/block/castle_stairs_dark_stone_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "vampirism:block/castle_block_dark_stone", - "side": "vampirism:block/castle_block_dark_stone", - "top": "vampirism:block/castle_block_dark_stone" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/castle_block_dark_brick_bloody.json b/src/generated/resources/assets/vampirism/models/block/chiseled_dark_stone_bricks.json similarity index 51% rename from src/generated/resources/assets/vampirism/models/block/castle_block_dark_brick_bloody.json rename to src/generated/resources/assets/vampirism/models/block/chiseled_dark_stone_bricks.json index ec2a4f1b15..77a39998f0 100644 --- a/src/generated/resources/assets/vampirism/models/block/castle_block_dark_brick_bloody.json +++ b/src/generated/resources/assets/vampirism/models/block/chiseled_dark_stone_bricks.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "vampirism:block/castle_block_dark_brick_bloody" + "all": "vampirism:block/chiseled_dark_stone_bricks" } } \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/castle_block_dark_brick.json b/src/generated/resources/assets/vampirism/models/block/cobbled_dark_stone.json similarity index 54% rename from src/generated/resources/assets/vampirism/models/block/castle_block_dark_brick.json rename to src/generated/resources/assets/vampirism/models/block/cobbled_dark_stone.json index a770133f31..86b6e4edd5 100644 --- a/src/generated/resources/assets/vampirism/models/block/castle_block_dark_brick.json +++ b/src/generated/resources/assets/vampirism/models/block/cobbled_dark_stone.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "vampirism:block/castle_block_dark_brick" + "all": "vampirism:block/cobbled_dark_stone" } } \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/cobbled_dark_stone_slab.json b/src/generated/resources/assets/vampirism/models/block/cobbled_dark_stone_slab.json new file mode 100644 index 0000000000..343de271cb --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/cobbled_dark_stone_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "vampirism:block/cobbled_dark_stone", + "side": "vampirism:block/cobbled_dark_stone", + "top": "vampirism:block/cobbled_dark_stone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/cobbled_dark_stone_slab_top.json b/src/generated/resources/assets/vampirism/models/block/cobbled_dark_stone_slab_top.json new file mode 100644 index 0000000000..e64af1ae3d --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/cobbled_dark_stone_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "vampirism:block/cobbled_dark_stone", + "side": "vampirism:block/cobbled_dark_stone", + "top": "vampirism:block/cobbled_dark_stone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/cobbled_dark_stone_stairs.json b/src/generated/resources/assets/vampirism/models/block/cobbled_dark_stone_stairs.json new file mode 100644 index 0000000000..2315528734 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/cobbled_dark_stone_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "vampirism:block/cobbled_dark_stone", + "side": "vampirism:block/cobbled_dark_stone", + "top": "vampirism:block/cobbled_dark_stone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/cobbled_dark_stone_stairs_inner.json b/src/generated/resources/assets/vampirism/models/block/cobbled_dark_stone_stairs_inner.json new file mode 100644 index 0000000000..c17288be10 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/cobbled_dark_stone_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "vampirism:block/cobbled_dark_stone", + "side": "vampirism:block/cobbled_dark_stone", + "top": "vampirism:block/cobbled_dark_stone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/cobbled_dark_stone_stairs_outer.json b/src/generated/resources/assets/vampirism/models/block/cobbled_dark_stone_stairs_outer.json new file mode 100644 index 0000000000..225a0da29e --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/cobbled_dark_stone_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "vampirism:block/cobbled_dark_stone", + "side": "vampirism:block/cobbled_dark_stone", + "top": "vampirism:block/cobbled_dark_stone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/castle_block_dark_brick_wall_post.json b/src/generated/resources/assets/vampirism/models/block/cobbled_dark_stone_wall_post.json similarity index 57% rename from src/generated/resources/assets/vampirism/models/block/castle_block_dark_brick_wall_post.json rename to src/generated/resources/assets/vampirism/models/block/cobbled_dark_stone_wall_post.json index 3a6666232d..698cc76a1f 100644 --- a/src/generated/resources/assets/vampirism/models/block/castle_block_dark_brick_wall_post.json +++ b/src/generated/resources/assets/vampirism/models/block/cobbled_dark_stone_wall_post.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_wall_post", "textures": { - "wall": "vampirism:block/castle_block_dark_brick" + "wall": "vampirism:block/cobbled_dark_stone" } } \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/castle_block_dark_brick_wall_side.json b/src/generated/resources/assets/vampirism/models/block/cobbled_dark_stone_wall_side.json similarity index 57% rename from src/generated/resources/assets/vampirism/models/block/castle_block_dark_brick_wall_side.json rename to src/generated/resources/assets/vampirism/models/block/cobbled_dark_stone_wall_side.json index c49493a5b9..a93dde28e1 100644 --- a/src/generated/resources/assets/vampirism/models/block/castle_block_dark_brick_wall_side.json +++ b/src/generated/resources/assets/vampirism/models/block/cobbled_dark_stone_wall_side.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_wall_side", "textures": { - "wall": "vampirism:block/castle_block_dark_brick" + "wall": "vampirism:block/cobbled_dark_stone" } } \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/castle_block_dark_brick_wall_side_tall.json b/src/generated/resources/assets/vampirism/models/block/cobbled_dark_stone_wall_side_tall.json similarity index 59% rename from src/generated/resources/assets/vampirism/models/block/castle_block_dark_brick_wall_side_tall.json rename to src/generated/resources/assets/vampirism/models/block/cobbled_dark_stone_wall_side_tall.json index ffaea2645c..95b57b38c3 100644 --- a/src/generated/resources/assets/vampirism/models/block/castle_block_dark_brick_wall_side_tall.json +++ b/src/generated/resources/assets/vampirism/models/block/cobbled_dark_stone_wall_side_tall.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/template_wall_side_tall", "textures": { - "wall": "vampirism:block/castle_block_dark_brick" + "wall": "vampirism:block/cobbled_dark_stone" } } \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/cracked_dark_stone_bricks.json b/src/generated/resources/assets/vampirism/models/block/cracked_dark_stone_bricks.json new file mode 100644 index 0000000000..4e79e53b88 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/cracked_dark_stone_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "vampirism:block/cracked_dark_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/cracked_dark_stone_tiles.json b/src/generated/resources/assets/vampirism/models/block/cracked_dark_stone_tiles.json new file mode 100644 index 0000000000..afcace9347 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/cracked_dark_stone_tiles.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "vampirism:block/cracked_dark_stone_tiles" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/castle_block_dark_stone.json b/src/generated/resources/assets/vampirism/models/block/dark_stone.json similarity index 54% rename from src/generated/resources/assets/vampirism/models/block/castle_block_dark_stone.json rename to src/generated/resources/assets/vampirism/models/block/dark_stone.json index 3872d200c8..0f077b730b 100644 --- a/src/generated/resources/assets/vampirism/models/block/castle_block_dark_stone.json +++ b/src/generated/resources/assets/vampirism/models/block/dark_stone.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/cube_all", "textures": { - "all": "vampirism:block/castle_block_dark_stone" + "all": "vampirism:block/dark_stone" } } \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/dark_stone_brick_slab.json b/src/generated/resources/assets/vampirism/models/block/dark_stone_brick_slab.json new file mode 100644 index 0000000000..273cfd1e93 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/dark_stone_brick_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "vampirism:block/dark_stone_bricks", + "side": "vampirism:block/dark_stone_bricks", + "top": "vampirism:block/dark_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/dark_stone_brick_slab_top.json b/src/generated/resources/assets/vampirism/models/block/dark_stone_brick_slab_top.json new file mode 100644 index 0000000000..a88d448f42 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/dark_stone_brick_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "vampirism:block/dark_stone_bricks", + "side": "vampirism:block/dark_stone_bricks", + "top": "vampirism:block/dark_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/dark_stone_brick_stairs.json b/src/generated/resources/assets/vampirism/models/block/dark_stone_brick_stairs.json new file mode 100644 index 0000000000..8ed54ee32c --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/dark_stone_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "vampirism:block/dark_stone_bricks", + "side": "vampirism:block/dark_stone_bricks", + "top": "vampirism:block/dark_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/dark_stone_brick_stairs_inner.json b/src/generated/resources/assets/vampirism/models/block/dark_stone_brick_stairs_inner.json new file mode 100644 index 0000000000..ff0664f6ad --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/dark_stone_brick_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "vampirism:block/dark_stone_bricks", + "side": "vampirism:block/dark_stone_bricks", + "top": "vampirism:block/dark_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/dark_stone_brick_stairs_outer.json b/src/generated/resources/assets/vampirism/models/block/dark_stone_brick_stairs_outer.json new file mode 100644 index 0000000000..2dcb156e55 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/dark_stone_brick_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "vampirism:block/dark_stone_bricks", + "side": "vampirism:block/dark_stone_bricks", + "top": "vampirism:block/dark_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/dark_stone_brick_wall_post.json b/src/generated/resources/assets/vampirism/models/block/dark_stone_brick_wall_post.json new file mode 100644 index 0000000000..e0198e3131 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/dark_stone_brick_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "vampirism:block/dark_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/dark_stone_brick_wall_side.json b/src/generated/resources/assets/vampirism/models/block/dark_stone_brick_wall_side.json new file mode 100644 index 0000000000..c6f588ec47 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/dark_stone_brick_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "vampirism:block/dark_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/dark_stone_brick_wall_side_tall.json b/src/generated/resources/assets/vampirism/models/block/dark_stone_brick_wall_side_tall.json new file mode 100644 index 0000000000..d150950789 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/dark_stone_brick_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "vampirism:block/dark_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/dark_stone_bricks.json b/src/generated/resources/assets/vampirism/models/block/dark_stone_bricks.json new file mode 100644 index 0000000000..feb6f1eb15 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/dark_stone_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "vampirism:block/dark_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/dark_stone_slab.json b/src/generated/resources/assets/vampirism/models/block/dark_stone_slab.json new file mode 100644 index 0000000000..e1b4d6a370 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/dark_stone_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "vampirism:block/dark_stone", + "side": "vampirism:block/dark_stone", + "top": "vampirism:block/dark_stone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/dark_stone_slab_top.json b/src/generated/resources/assets/vampirism/models/block/dark_stone_slab_top.json new file mode 100644 index 0000000000..b0439f0bbd --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/dark_stone_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "vampirism:block/dark_stone", + "side": "vampirism:block/dark_stone", + "top": "vampirism:block/dark_stone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/dark_stone_stairs.json b/src/generated/resources/assets/vampirism/models/block/dark_stone_stairs.json new file mode 100644 index 0000000000..25097017f4 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/dark_stone_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "vampirism:block/dark_stone", + "side": "vampirism:block/dark_stone", + "top": "vampirism:block/dark_stone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/dark_stone_stairs_inner.json b/src/generated/resources/assets/vampirism/models/block/dark_stone_stairs_inner.json new file mode 100644 index 0000000000..fd156f4d2f --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/dark_stone_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "vampirism:block/dark_stone", + "side": "vampirism:block/dark_stone", + "top": "vampirism:block/dark_stone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/dark_stone_stairs_outer.json b/src/generated/resources/assets/vampirism/models/block/dark_stone_stairs_outer.json new file mode 100644 index 0000000000..5f962025c7 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/dark_stone_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "vampirism:block/dark_stone", + "side": "vampirism:block/dark_stone", + "top": "vampirism:block/dark_stone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/dark_stone_tiles.json b/src/generated/resources/assets/vampirism/models/block/dark_stone_tiles.json new file mode 100644 index 0000000000..a291cd3e83 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/dark_stone_tiles.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "vampirism:block/dark_stone_tiles" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/dark_stone_tiles_slab.json b/src/generated/resources/assets/vampirism/models/block/dark_stone_tiles_slab.json new file mode 100644 index 0000000000..a8c3b60d1c --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/dark_stone_tiles_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "vampirism:block/dark_stone_tiles", + "side": "vampirism:block/dark_stone_tiles", + "top": "vampirism:block/dark_stone_tiles" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/dark_stone_tiles_slab_top.json b/src/generated/resources/assets/vampirism/models/block/dark_stone_tiles_slab_top.json new file mode 100644 index 0000000000..df2a00890f --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/dark_stone_tiles_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "vampirism:block/dark_stone_tiles", + "side": "vampirism:block/dark_stone_tiles", + "top": "vampirism:block/dark_stone_tiles" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/dark_stone_tiles_stairs.json b/src/generated/resources/assets/vampirism/models/block/dark_stone_tiles_stairs.json new file mode 100644 index 0000000000..7058d2ecf5 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/dark_stone_tiles_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "vampirism:block/dark_stone_tiles", + "side": "vampirism:block/dark_stone_tiles", + "top": "vampirism:block/dark_stone_tiles" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/dark_stone_tiles_stairs_inner.json b/src/generated/resources/assets/vampirism/models/block/dark_stone_tiles_stairs_inner.json new file mode 100644 index 0000000000..f420c94584 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/dark_stone_tiles_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "vampirism:block/dark_stone_tiles", + "side": "vampirism:block/dark_stone_tiles", + "top": "vampirism:block/dark_stone_tiles" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/dark_stone_tiles_stairs_outer.json b/src/generated/resources/assets/vampirism/models/block/dark_stone_tiles_stairs_outer.json new file mode 100644 index 0000000000..317288dedc --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/dark_stone_tiles_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "vampirism:block/dark_stone_tiles", + "side": "vampirism:block/dark_stone_tiles", + "top": "vampirism:block/dark_stone_tiles" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/dark_stone_tiles_wall_post.json b/src/generated/resources/assets/vampirism/models/block/dark_stone_tiles_wall_post.json new file mode 100644 index 0000000000..e555b49e74 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/dark_stone_tiles_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "vampirism:block/dark_stone_tiles" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/dark_stone_tiles_wall_side.json b/src/generated/resources/assets/vampirism/models/block/dark_stone_tiles_wall_side.json new file mode 100644 index 0000000000..64d11c7268 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/dark_stone_tiles_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "vampirism:block/dark_stone_tiles" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/dark_stone_tiles_wall_side_tall.json b/src/generated/resources/assets/vampirism/models/block/dark_stone_tiles_wall_side_tall.json new file mode 100644 index 0000000000..9e6253c864 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/dark_stone_tiles_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "vampirism:block/dark_stone_tiles" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/dark_stone_wall_post.json b/src/generated/resources/assets/vampirism/models/block/dark_stone_wall_post.json new file mode 100644 index 0000000000..7d6e0c4fae --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/dark_stone_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "vampirism:block/dark_stone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/dark_stone_wall_side.json b/src/generated/resources/assets/vampirism/models/block/dark_stone_wall_side.json new file mode 100644 index 0000000000..5dd5f636b5 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/dark_stone_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "vampirism:block/dark_stone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/dark_stone_wall_side_tall.json b/src/generated/resources/assets/vampirism/models/block/dark_stone_wall_side_tall.json new file mode 100644 index 0000000000..f8bd839130 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/dark_stone_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "vampirism:block/dark_stone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/polished_dark_stone.json b/src/generated/resources/assets/vampirism/models/block/polished_dark_stone.json new file mode 100644 index 0000000000..b9a5751418 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/polished_dark_stone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "vampirism:block/polished_dark_stone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/polished_dark_stone_slab.json b/src/generated/resources/assets/vampirism/models/block/polished_dark_stone_slab.json new file mode 100644 index 0000000000..fdee2cbf43 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/polished_dark_stone_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "vampirism:block/polished_dark_stone", + "side": "vampirism:block/polished_dark_stone", + "top": "vampirism:block/polished_dark_stone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/polished_dark_stone_slab_top.json b/src/generated/resources/assets/vampirism/models/block/polished_dark_stone_slab_top.json new file mode 100644 index 0000000000..34c3fa0684 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/polished_dark_stone_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "vampirism:block/polished_dark_stone", + "side": "vampirism:block/polished_dark_stone", + "top": "vampirism:block/polished_dark_stone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/polished_dark_stone_stairs.json b/src/generated/resources/assets/vampirism/models/block/polished_dark_stone_stairs.json new file mode 100644 index 0000000000..4241b67db3 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/polished_dark_stone_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "vampirism:block/polished_dark_stone", + "side": "vampirism:block/polished_dark_stone", + "top": "vampirism:block/polished_dark_stone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/polished_dark_stone_stairs_inner.json b/src/generated/resources/assets/vampirism/models/block/polished_dark_stone_stairs_inner.json new file mode 100644 index 0000000000..67866cf19d --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/polished_dark_stone_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "vampirism:block/polished_dark_stone", + "side": "vampirism:block/polished_dark_stone", + "top": "vampirism:block/polished_dark_stone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/polished_dark_stone_stairs_outer.json b/src/generated/resources/assets/vampirism/models/block/polished_dark_stone_stairs_outer.json new file mode 100644 index 0000000000..b1eb2f3549 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/polished_dark_stone_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "vampirism:block/polished_dark_stone", + "side": "vampirism:block/polished_dark_stone", + "top": "vampirism:block/polished_dark_stone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/polished_dark_stone_wall_post.json b/src/generated/resources/assets/vampirism/models/block/polished_dark_stone_wall_post.json new file mode 100644 index 0000000000..9823be53e3 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/polished_dark_stone_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "vampirism:block/polished_dark_stone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/polished_dark_stone_wall_side.json b/src/generated/resources/assets/vampirism/models/block/polished_dark_stone_wall_side.json new file mode 100644 index 0000000000..c4354210cd --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/polished_dark_stone_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "vampirism:block/polished_dark_stone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/block/polished_dark_stone_wall_side_tall.json b/src/generated/resources/assets/vampirism/models/block/polished_dark_stone_wall_side_tall.json new file mode 100644 index 0000000000..055546147c --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/block/polished_dark_stone_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "vampirism:block/polished_dark_stone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/item/bloody_dark_stone_bricks.json b/src/generated/resources/assets/vampirism/models/item/bloody_dark_stone_bricks.json new file mode 100644 index 0000000000..37d2b96239 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/item/bloody_dark_stone_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "vampirism:block/bloody_dark_stone_bricks" +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/item/castle_block_dark_brick.json b/src/generated/resources/assets/vampirism/models/item/castle_block_dark_brick.json deleted file mode 100644 index fc0677d19e..0000000000 --- a/src/generated/resources/assets/vampirism/models/item/castle_block_dark_brick.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "vampirism:block/castle_block_dark_brick" -} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/item/castle_block_dark_brick_bloody.json b/src/generated/resources/assets/vampirism/models/item/castle_block_dark_brick_bloody.json deleted file mode 100644 index d4df71f7d4..0000000000 --- a/src/generated/resources/assets/vampirism/models/item/castle_block_dark_brick_bloody.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "vampirism:block/castle_block_dark_brick_bloody" -} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/item/castle_block_dark_brick_cracked.json b/src/generated/resources/assets/vampirism/models/item/castle_block_dark_brick_cracked.json deleted file mode 100644 index 56d732ea44..0000000000 --- a/src/generated/resources/assets/vampirism/models/item/castle_block_dark_brick_cracked.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "vampirism:block/castle_block_dark_brick_cracked" -} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/item/castle_block_dark_stone.json b/src/generated/resources/assets/vampirism/models/item/castle_block_dark_stone.json deleted file mode 100644 index 9e87078533..0000000000 --- a/src/generated/resources/assets/vampirism/models/item/castle_block_dark_stone.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "vampirism:block/castle_block_dark_stone" -} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/item/castle_block_normal_brick.json b/src/generated/resources/assets/vampirism/models/item/castle_block_normal_brick.json deleted file mode 100644 index 6b9b3ae892..0000000000 --- a/src/generated/resources/assets/vampirism/models/item/castle_block_normal_brick.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "vampirism:block/castle_block_normal_brick" -} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/item/castle_slab_dark_brick.json b/src/generated/resources/assets/vampirism/models/item/castle_slab_dark_brick.json deleted file mode 100644 index 83791bcbec..0000000000 --- a/src/generated/resources/assets/vampirism/models/item/castle_slab_dark_brick.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "vampirism:block/castle_slab_dark_brick" -} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/item/castle_slab_dark_stone.json b/src/generated/resources/assets/vampirism/models/item/castle_slab_dark_stone.json deleted file mode 100644 index 98565732be..0000000000 --- a/src/generated/resources/assets/vampirism/models/item/castle_slab_dark_stone.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "vampirism:block/castle_slab_dark_stone" -} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/item/castle_stairs_dark_brick.json b/src/generated/resources/assets/vampirism/models/item/castle_stairs_dark_brick.json deleted file mode 100644 index ab77cb2129..0000000000 --- a/src/generated/resources/assets/vampirism/models/item/castle_stairs_dark_brick.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "vampirism:block/castle_stairs_dark_brick" -} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/item/castle_stairs_dark_stone.json b/src/generated/resources/assets/vampirism/models/item/castle_stairs_dark_stone.json deleted file mode 100644 index 2869e2465b..0000000000 --- a/src/generated/resources/assets/vampirism/models/item/castle_stairs_dark_stone.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "vampirism:block/castle_stairs_dark_stone" -} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/item/chiseled_dark_stone_bricks.json b/src/generated/resources/assets/vampirism/models/item/chiseled_dark_stone_bricks.json new file mode 100644 index 0000000000..4a96764568 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/item/chiseled_dark_stone_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "vampirism:block/chiseled_dark_stone_bricks" +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/item/cobbled_dark_stone.json b/src/generated/resources/assets/vampirism/models/item/cobbled_dark_stone.json new file mode 100644 index 0000000000..f067748ff8 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/item/cobbled_dark_stone.json @@ -0,0 +1,3 @@ +{ + "parent": "vampirism:block/cobbled_dark_stone" +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/item/cobbled_dark_stone_slab.json b/src/generated/resources/assets/vampirism/models/item/cobbled_dark_stone_slab.json new file mode 100644 index 0000000000..0e03bfb6ff --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/item/cobbled_dark_stone_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "vampirism:block/cobbled_dark_stone_slab" +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/item/cobbled_dark_stone_stairs.json b/src/generated/resources/assets/vampirism/models/item/cobbled_dark_stone_stairs.json new file mode 100644 index 0000000000..8d750d2b98 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/item/cobbled_dark_stone_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "vampirism:block/cobbled_dark_stone_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/item/castle_block_dark_brick_wall.json b/src/generated/resources/assets/vampirism/models/item/cobbled_dark_stone_wall.json similarity index 56% rename from src/generated/resources/assets/vampirism/models/item/castle_block_dark_brick_wall.json rename to src/generated/resources/assets/vampirism/models/item/cobbled_dark_stone_wall.json index d78d9b3cd8..8c6216ec47 100644 --- a/src/generated/resources/assets/vampirism/models/item/castle_block_dark_brick_wall.json +++ b/src/generated/resources/assets/vampirism/models/item/cobbled_dark_stone_wall.json @@ -1,6 +1,6 @@ { "parent": "minecraft:block/wall_inventory", "textures": { - "wall": "vampirism:block/castle_block_dark_brick" + "wall": "vampirism:block/cobbled_dark_stone" } } \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/item/cracked_dark_stone_bricks.json b/src/generated/resources/assets/vampirism/models/item/cracked_dark_stone_bricks.json new file mode 100644 index 0000000000..30194283ce --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/item/cracked_dark_stone_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "vampirism:block/cracked_dark_stone_bricks" +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/item/cracked_dark_stone_tiles.json b/src/generated/resources/assets/vampirism/models/item/cracked_dark_stone_tiles.json new file mode 100644 index 0000000000..5e7f92d07c --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/item/cracked_dark_stone_tiles.json @@ -0,0 +1,3 @@ +{ + "parent": "vampirism:block/cracked_dark_stone_tiles" +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/item/dark_stone.json b/src/generated/resources/assets/vampirism/models/item/dark_stone.json new file mode 100644 index 0000000000..718784212e --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/item/dark_stone.json @@ -0,0 +1,3 @@ +{ + "parent": "vampirism:block/dark_stone" +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/item/dark_stone_brick_slab.json b/src/generated/resources/assets/vampirism/models/item/dark_stone_brick_slab.json new file mode 100644 index 0000000000..4ba334a26a --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/item/dark_stone_brick_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "vampirism:block/dark_stone_brick_slab" +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/item/dark_stone_brick_stairs.json b/src/generated/resources/assets/vampirism/models/item/dark_stone_brick_stairs.json new file mode 100644 index 0000000000..b06761d384 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/item/dark_stone_brick_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "vampirism:block/dark_stone_brick_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/item/dark_stone_brick_wall.json b/src/generated/resources/assets/vampirism/models/item/dark_stone_brick_wall.json new file mode 100644 index 0000000000..981a97b478 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/item/dark_stone_brick_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "vampirism:block/dark_stone_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/item/dark_stone_bricks.json b/src/generated/resources/assets/vampirism/models/item/dark_stone_bricks.json new file mode 100644 index 0000000000..a38570c70d --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/item/dark_stone_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "vampirism:block/dark_stone_bricks" +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/item/dark_stone_slab.json b/src/generated/resources/assets/vampirism/models/item/dark_stone_slab.json new file mode 100644 index 0000000000..c1310c3352 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/item/dark_stone_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "vampirism:block/dark_stone_slab" +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/item/dark_stone_stairs.json b/src/generated/resources/assets/vampirism/models/item/dark_stone_stairs.json new file mode 100644 index 0000000000..275592c6a5 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/item/dark_stone_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "vampirism:block/dark_stone_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/item/dark_stone_tiles.json b/src/generated/resources/assets/vampirism/models/item/dark_stone_tiles.json new file mode 100644 index 0000000000..ee0a777ed7 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/item/dark_stone_tiles.json @@ -0,0 +1,3 @@ +{ + "parent": "vampirism:block/dark_stone_tiles" +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/item/dark_stone_tiles_slab.json b/src/generated/resources/assets/vampirism/models/item/dark_stone_tiles_slab.json new file mode 100644 index 0000000000..7fc2fbf23d --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/item/dark_stone_tiles_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "vampirism:block/dark_stone_tiles_slab" +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/item/dark_stone_tiles_stairs.json b/src/generated/resources/assets/vampirism/models/item/dark_stone_tiles_stairs.json new file mode 100644 index 0000000000..a46fe5392f --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/item/dark_stone_tiles_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "vampirism:block/dark_stone_tiles_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/item/dark_stone_tiles_wall.json b/src/generated/resources/assets/vampirism/models/item/dark_stone_tiles_wall.json new file mode 100644 index 0000000000..805c4ef34d --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/item/dark_stone_tiles_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "vampirism:block/dark_stone_tiles" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/item/dark_stone_wall.json b/src/generated/resources/assets/vampirism/models/item/dark_stone_wall.json new file mode 100644 index 0000000000..9095fbae61 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/item/dark_stone_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "vampirism:block/dark_stone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/item/infested_dark_stone.json b/src/generated/resources/assets/vampirism/models/item/infested_dark_stone.json new file mode 100644 index 0000000000..718784212e --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/item/infested_dark_stone.json @@ -0,0 +1,3 @@ +{ + "parent": "vampirism:block/dark_stone" +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/item/polished_dark_stone.json b/src/generated/resources/assets/vampirism/models/item/polished_dark_stone.json new file mode 100644 index 0000000000..c89824ec39 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/item/polished_dark_stone.json @@ -0,0 +1,3 @@ +{ + "parent": "vampirism:block/polished_dark_stone" +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/item/polished_dark_stone_slab.json b/src/generated/resources/assets/vampirism/models/item/polished_dark_stone_slab.json new file mode 100644 index 0000000000..c79603440b --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/item/polished_dark_stone_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "vampirism:block/polished_dark_stone_slab" +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/item/polished_dark_stone_stairs.json b/src/generated/resources/assets/vampirism/models/item/polished_dark_stone_stairs.json new file mode 100644 index 0000000000..b2624831aa --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/item/polished_dark_stone_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "vampirism:block/polished_dark_stone_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/assets/vampirism/models/item/polished_dark_stone_wall.json b/src/generated/resources/assets/vampirism/models/item/polished_dark_stone_wall.json new file mode 100644 index 0000000000..a7757afd32 --- /dev/null +++ b/src/generated/resources/assets/vampirism/models/item/polished_dark_stone_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "vampirism:block/polished_dark_stone" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/stone.json b/src/generated/resources/data/forge/tags/blocks/stone.json new file mode 100644 index 0000000000..e60a9a7849 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/stone.json @@ -0,0 +1,7 @@ +{ + "values": [ + "vampirism:dark_stone", + "vampirism:infested_dark_stone", + "vampirism:polished_dark_stone" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/castle_block_dark_brick_wall_from_castle_block_dark_brick_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/castle_block_dark_brick_wall_from_castle_block_dark_brick_stonecutting.json deleted file mode 100644 index 9435f53f51..0000000000 --- a/src/generated/resources/data/minecraft/advancements/recipes/decorations/castle_block_dark_brick_wall_from_castle_block_dark_brick_stonecutting.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_castle_block_dark_brick": { - "conditions": { - "items": [ - { - "items": [ - "vampirism:castle_block_dark_brick" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:castle_block_dark_brick_wall_from_castle_block_dark_brick_stonecutting" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_castle_block_dark_brick", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:castle_block_dark_brick_wall_from_castle_block_dark_brick_stonecutting" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/cobbled_dark_stone_slab_from_cobbled_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/cobbled_dark_stone_slab_from_cobbled_dark_stone_stonecutting.json new file mode 100644 index 0000000000..9ba8e11aae --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/cobbled_dark_stone_slab_from_cobbled_dark_stone_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cobbled_dark_stone": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:cobbled_dark_stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:cobbled_dark_stone_slab_from_cobbled_dark_stone_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cobbled_dark_stone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:cobbled_dark_stone_slab_from_cobbled_dark_stone_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/cobbled_dark_stone_stairs_from_cobbled_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/cobbled_dark_stone_stairs_from_cobbled_dark_stone_stonecutting.json new file mode 100644 index 0000000000..f9d4bcd8f4 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/cobbled_dark_stone_stairs_from_cobbled_dark_stone_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cobbled_dark_stone": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:cobbled_dark_stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:cobbled_dark_stone_stairs_from_cobbled_dark_stone_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cobbled_dark_stone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:cobbled_dark_stone_stairs_from_cobbled_dark_stone_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/cobbled_dark_stone_wall_from_cobbled_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/cobbled_dark_stone_wall_from_cobbled_dark_stone_stonecutting.json new file mode 100644 index 0000000000..c64c1a2d41 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/cobbled_dark_stone_wall_from_cobbled_dark_stone_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cobbled_dark_stone": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:cobbled_dark_stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:cobbled_dark_stone_wall_from_cobbled_dark_stone_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cobbled_dark_stone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:cobbled_dark_stone_wall_from_cobbled_dark_stone_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_brick_slab_from_cobbled_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_brick_slab_from_cobbled_dark_stone_stonecutting.json new file mode 100644 index 0000000000..8a1dd8dc7f --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_brick_slab_from_cobbled_dark_stone_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cobbled_dark_stone": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:cobbled_dark_stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dark_stone_brick_slab_from_cobbled_dark_stone_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cobbled_dark_stone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dark_stone_brick_slab_from_cobbled_dark_stone_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_brick_slab_from_dark_stone_bricks_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_brick_slab_from_dark_stone_bricks_stonecutting.json new file mode 100644 index 0000000000..4dac1a8783 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_brick_slab_from_dark_stone_bricks_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dark_stone_bricks": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:dark_stone_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dark_stone_brick_slab_from_dark_stone_bricks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_dark_stone_bricks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dark_stone_brick_slab_from_dark_stone_bricks_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_brick_slab_from_polished_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_brick_slab_from_polished_dark_stone_stonecutting.json new file mode 100644 index 0000000000..e05ff19e42 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_brick_slab_from_polished_dark_stone_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_polished_dark_stone": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:polished_dark_stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dark_stone_brick_slab_from_polished_dark_stone_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_polished_dark_stone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dark_stone_brick_slab_from_polished_dark_stone_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_brick_stairs_from_cobbled_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_brick_stairs_from_cobbled_dark_stone_stonecutting.json new file mode 100644 index 0000000000..626f77043c --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_brick_stairs_from_cobbled_dark_stone_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cobbled_dark_stone": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:cobbled_dark_stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dark_stone_brick_stairs_from_cobbled_dark_stone_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cobbled_dark_stone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dark_stone_brick_stairs_from_cobbled_dark_stone_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_brick_stairs_from_dark_stone_bricks_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_brick_stairs_from_dark_stone_bricks_stonecutting.json new file mode 100644 index 0000000000..dca37bad61 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_brick_stairs_from_dark_stone_bricks_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dark_stone_bricks": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:dark_stone_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dark_stone_brick_stairs_from_dark_stone_bricks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_dark_stone_bricks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dark_stone_brick_stairs_from_dark_stone_bricks_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_brick_stairs_from_polished_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_brick_stairs_from_polished_dark_stone_stonecutting.json new file mode 100644 index 0000000000..f3c348efa4 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_brick_stairs_from_polished_dark_stone_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_polished_dark_stone": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:polished_dark_stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dark_stone_brick_stairs_from_polished_dark_stone_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_polished_dark_stone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dark_stone_brick_stairs_from_polished_dark_stone_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_brick_wall_from_cobbled_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_brick_wall_from_cobbled_dark_stone_stonecutting.json new file mode 100644 index 0000000000..f3c0dcf8dd --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_brick_wall_from_cobbled_dark_stone_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cobbled_dark_stone": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:cobbled_dark_stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dark_stone_brick_wall_from_cobbled_dark_stone_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cobbled_dark_stone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dark_stone_brick_wall_from_cobbled_dark_stone_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_brick_wall_from_dark_stone_bricks_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_brick_wall_from_dark_stone_bricks_stonecutting.json new file mode 100644 index 0000000000..40cd240e94 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_brick_wall_from_dark_stone_bricks_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dark_stone_bricks": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:dark_stone_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dark_stone_brick_wall_from_dark_stone_bricks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_dark_stone_bricks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dark_stone_brick_wall_from_dark_stone_bricks_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_brick_wall_from_polished_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_brick_wall_from_polished_dark_stone_stonecutting.json new file mode 100644 index 0000000000..f33a75ad9c --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_brick_wall_from_polished_dark_stone_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_polished_dark_stone": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:polished_dark_stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dark_stone_brick_wall_from_polished_dark_stone_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_polished_dark_stone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dark_stone_brick_wall_from_polished_dark_stone_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_bricks_from_cobbled_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_bricks_from_cobbled_dark_stone_stonecutting.json new file mode 100644 index 0000000000..d0c8304b2d --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_bricks_from_cobbled_dark_stone_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cobbled_dark_stone": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:cobbled_dark_stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dark_stone_bricks_from_cobbled_dark_stone_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cobbled_dark_stone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dark_stone_bricks_from_cobbled_dark_stone_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_bricks_from_polished_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_bricks_from_polished_dark_stone_stonecutting.json new file mode 100644 index 0000000000..4aae9b58b3 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_bricks_from_polished_dark_stone_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_polished_dark_stone": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:polished_dark_stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dark_stone_bricks_from_polished_dark_stone_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_polished_dark_stone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dark_stone_bricks_from_polished_dark_stone_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_from_cobbled_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_from_cobbled_dark_stone_stonecutting.json new file mode 100644 index 0000000000..1a751dad83 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_from_cobbled_dark_stone_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cobbled_dark_stone": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:cobbled_dark_stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dark_stone_tiles_from_cobbled_dark_stone_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cobbled_dark_stone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dark_stone_tiles_from_cobbled_dark_stone_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/castle_slab_dark_stone.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_from_dark_stone_bricks_stonecutting.json similarity index 64% rename from src/generated/resources/data/vampirism/advancements/recipes/building_blocks/castle_slab_dark_stone.json rename to src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_from_dark_stone_bricks_stonecutting.json index a8cb14a91e..1efd68f47a 100644 --- a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/castle_slab_dark_stone.json +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_from_dark_stone_bricks_stonecutting.json @@ -1,12 +1,12 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_castle_block_dark_stone": { + "has_dark_stone_bricks": { "conditions": { "items": [ { "items": [ - "vampirism:castle_block_dark_stone" + "vampirism:dark_stone_bricks" ] } ] @@ -15,20 +15,20 @@ }, "has_the_recipe": { "conditions": { - "recipe": "vampirism:castle_slab_dark_stone" + "recipe": "minecraft:dark_stone_tiles_from_dark_stone_bricks_stonecutting" }, "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_castle_block_dark_stone", + "has_dark_stone_bricks", "has_the_recipe" ] ], "rewards": { "recipes": [ - "vampirism:castle_slab_dark_stone" + "minecraft:dark_stone_tiles_from_dark_stone_bricks_stonecutting" ] }, "sends_telemetry_event": false diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_from_polished_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_from_polished_dark_stone_stonecutting.json new file mode 100644 index 0000000000..1becdb4301 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_from_polished_dark_stone_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_polished_dark_stone": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:polished_dark_stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dark_stone_tiles_from_polished_dark_stone_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_polished_dark_stone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dark_stone_tiles_from_polished_dark_stone_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_slab_from_cobbled_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_slab_from_cobbled_dark_stone_stonecutting.json new file mode 100644 index 0000000000..7c7435f54d --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_slab_from_cobbled_dark_stone_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cobbled_dark_stone": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:cobbled_dark_stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dark_stone_tiles_slab_from_cobbled_dark_stone_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cobbled_dark_stone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dark_stone_tiles_slab_from_cobbled_dark_stone_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_slab_from_dark_stone_bricks_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_slab_from_dark_stone_bricks_stonecutting.json new file mode 100644 index 0000000000..1292ca002d --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_slab_from_dark_stone_bricks_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dark_stone_bricks": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:dark_stone_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dark_stone_tiles_slab_from_dark_stone_bricks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_dark_stone_bricks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dark_stone_tiles_slab_from_dark_stone_bricks_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_slab_from_dark_stone_tiles_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_slab_from_dark_stone_tiles_stonecutting.json new file mode 100644 index 0000000000..00920e053c --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_slab_from_dark_stone_tiles_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dark_stone_tiles": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:dark_stone_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dark_stone_tiles_slab_from_dark_stone_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_dark_stone_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dark_stone_tiles_slab_from_dark_stone_tiles_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_stairs_from_cobbled_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_stairs_from_cobbled_dark_stone_stonecutting.json new file mode 100644 index 0000000000..42168fe68d --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_stairs_from_cobbled_dark_stone_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cobbled_dark_stone": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:cobbled_dark_stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dark_stone_tiles_stairs_from_cobbled_dark_stone_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cobbled_dark_stone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dark_stone_tiles_stairs_from_cobbled_dark_stone_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_stairs_from_dark_stone_bricks_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_stairs_from_dark_stone_bricks_stonecutting.json new file mode 100644 index 0000000000..dcae253c71 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_stairs_from_dark_stone_bricks_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dark_stone_bricks": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:dark_stone_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dark_stone_tiles_stairs_from_dark_stone_bricks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_dark_stone_bricks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dark_stone_tiles_stairs_from_dark_stone_bricks_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_stairs_from_dark_stone_tiles_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_stairs_from_dark_stone_tiles_stonecutting.json new file mode 100644 index 0000000000..621a415627 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_stairs_from_dark_stone_tiles_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dark_stone_tiles": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:dark_stone_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dark_stone_tiles_stairs_from_dark_stone_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_dark_stone_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dark_stone_tiles_stairs_from_dark_stone_tiles_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_wall_from_cobbled_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_wall_from_cobbled_dark_stone_stonecutting.json new file mode 100644 index 0000000000..d845008383 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_wall_from_cobbled_dark_stone_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cobbled_dark_stone": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:cobbled_dark_stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dark_stone_tiles_wall_from_cobbled_dark_stone_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cobbled_dark_stone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dark_stone_tiles_wall_from_cobbled_dark_stone_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_wall_from_dark_stone_bricks_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_wall_from_dark_stone_bricks_stonecutting.json new file mode 100644 index 0000000000..881642bd95 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_wall_from_dark_stone_bricks_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dark_stone_bricks": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:dark_stone_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dark_stone_tiles_wall_from_dark_stone_bricks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_dark_stone_bricks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dark_stone_tiles_wall_from_dark_stone_bricks_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_wall_from_dark_stone_tiles_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_wall_from_dark_stone_tiles_stonecutting.json new file mode 100644 index 0000000000..5808d6b9e2 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/dark_stone_tiles_wall_from_dark_stone_tiles_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dark_stone_tiles": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:dark_stone_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:dark_stone_tiles_wall_from_dark_stone_tiles_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_dark_stone_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:dark_stone_tiles_wall_from_dark_stone_tiles_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/polished_dark_stone_from_cobbled_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/polished_dark_stone_from_cobbled_dark_stone_stonecutting.json new file mode 100644 index 0000000000..29397e25cc --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/polished_dark_stone_from_cobbled_dark_stone_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cobbled_dark_stone": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:cobbled_dark_stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:polished_dark_stone_from_cobbled_dark_stone_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cobbled_dark_stone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:polished_dark_stone_from_cobbled_dark_stone_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/polished_dark_stone_slab_from_cobbled_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/polished_dark_stone_slab_from_cobbled_dark_stone_stonecutting.json new file mode 100644 index 0000000000..ac37bbb012 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/polished_dark_stone_slab_from_cobbled_dark_stone_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cobbled_dark_stone": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:cobbled_dark_stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:polished_dark_stone_slab_from_cobbled_dark_stone_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cobbled_dark_stone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:polished_dark_stone_slab_from_cobbled_dark_stone_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/polished_dark_stone_slab_from_polished_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/polished_dark_stone_slab_from_polished_dark_stone_stonecutting.json new file mode 100644 index 0000000000..4fad99573f --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/polished_dark_stone_slab_from_polished_dark_stone_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_polished_dark_stone": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:polished_dark_stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:polished_dark_stone_slab_from_polished_dark_stone_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_polished_dark_stone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:polished_dark_stone_slab_from_polished_dark_stone_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/polished_dark_stone_stairs_from_cobbled_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/polished_dark_stone_stairs_from_cobbled_dark_stone_stonecutting.json new file mode 100644 index 0000000000..4d752f0f7c --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/polished_dark_stone_stairs_from_cobbled_dark_stone_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cobbled_dark_stone": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:cobbled_dark_stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:polished_dark_stone_stairs_from_cobbled_dark_stone_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cobbled_dark_stone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:polished_dark_stone_stairs_from_cobbled_dark_stone_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/polished_dark_stone_stairs_from_polished_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/polished_dark_stone_stairs_from_polished_dark_stone_stonecutting.json new file mode 100644 index 0000000000..e82cd4ea36 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/polished_dark_stone_stairs_from_polished_dark_stone_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_polished_dark_stone": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:polished_dark_stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:polished_dark_stone_stairs_from_polished_dark_stone_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_polished_dark_stone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:polished_dark_stone_stairs_from_polished_dark_stone_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/polished_dark_stone_wall_from_cobbled_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/polished_dark_stone_wall_from_cobbled_dark_stone_stonecutting.json new file mode 100644 index 0000000000..fccfb541bd --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/polished_dark_stone_wall_from_cobbled_dark_stone_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cobbled_dark_stone": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:cobbled_dark_stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:polished_dark_stone_wall_from_cobbled_dark_stone_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cobbled_dark_stone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:polished_dark_stone_wall_from_cobbled_dark_stone_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/decorations/polished_dark_stone_wall_from_polished_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/advancements/recipes/decorations/polished_dark_stone_wall_from_polished_dark_stone_stonecutting.json new file mode 100644 index 0000000000..02ee8df469 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/decorations/polished_dark_stone_wall_from_polished_dark_stone_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_polished_dark_stone": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:polished_dark_stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:polished_dark_stone_wall_from_polished_dark_stone_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_polished_dark_stone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:polished_dark_stone_wall_from_polished_dark_stone_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/castle_block_dark_brick_wall_from_castle_block_dark_brick_stonecutting.json b/src/generated/resources/data/minecraft/recipes/castle_block_dark_brick_wall_from_castle_block_dark_brick_stonecutting.json deleted file mode 100644 index 1e1c63d49d..0000000000 --- a/src/generated/resources/data/minecraft/recipes/castle_block_dark_brick_wall_from_castle_block_dark_brick_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 1, - "ingredient": { - "item": "vampirism:castle_block_dark_brick" - }, - "result": "vampirism:castle_block_dark_brick_wall" -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/cobbled_dark_stone_slab_from_cobbled_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/recipes/cobbled_dark_stone_slab_from_cobbled_dark_stone_stonecutting.json new file mode 100644 index 0000000000..591922e028 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/cobbled_dark_stone_slab_from_cobbled_dark_stone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 2, + "ingredient": { + "item": "vampirism:cobbled_dark_stone" + }, + "result": "vampirism:cobbled_dark_stone_slab" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/cobbled_dark_stone_stairs_from_cobbled_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/recipes/cobbled_dark_stone_stairs_from_cobbled_dark_stone_stonecutting.json new file mode 100644 index 0000000000..a82d50e2df --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/cobbled_dark_stone_stairs_from_cobbled_dark_stone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "vampirism:cobbled_dark_stone" + }, + "result": "vampirism:cobbled_dark_stone_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/cobbled_dark_stone_wall_from_cobbled_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/recipes/cobbled_dark_stone_wall_from_cobbled_dark_stone_stonecutting.json new file mode 100644 index 0000000000..27a4b1decb --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/cobbled_dark_stone_wall_from_cobbled_dark_stone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "vampirism:cobbled_dark_stone" + }, + "result": "vampirism:cobbled_dark_stone_wall" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/dark_stone_brick_slab_from_cobbled_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/recipes/dark_stone_brick_slab_from_cobbled_dark_stone_stonecutting.json new file mode 100644 index 0000000000..291e7d95a3 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/dark_stone_brick_slab_from_cobbled_dark_stone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 2, + "ingredient": { + "item": "vampirism:cobbled_dark_stone" + }, + "result": "vampirism:dark_stone_brick_slab" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/dark_stone_brick_slab_from_dark_stone_bricks_stonecutting.json b/src/generated/resources/data/minecraft/recipes/dark_stone_brick_slab_from_dark_stone_bricks_stonecutting.json new file mode 100644 index 0000000000..06ab899acd --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/dark_stone_brick_slab_from_dark_stone_bricks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 2, + "ingredient": { + "item": "vampirism:dark_stone_bricks" + }, + "result": "vampirism:dark_stone_brick_slab" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/dark_stone_brick_slab_from_polished_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/recipes/dark_stone_brick_slab_from_polished_dark_stone_stonecutting.json new file mode 100644 index 0000000000..1b719df45b --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/dark_stone_brick_slab_from_polished_dark_stone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 2, + "ingredient": { + "item": "vampirism:polished_dark_stone" + }, + "result": "vampirism:dark_stone_brick_slab" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/dark_stone_brick_stairs_from_cobbled_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/recipes/dark_stone_brick_stairs_from_cobbled_dark_stone_stonecutting.json new file mode 100644 index 0000000000..b644c19aab --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/dark_stone_brick_stairs_from_cobbled_dark_stone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "vampirism:cobbled_dark_stone" + }, + "result": "vampirism:dark_stone_brick_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/dark_stone_brick_stairs_from_dark_stone_bricks_stonecutting.json b/src/generated/resources/data/minecraft/recipes/dark_stone_brick_stairs_from_dark_stone_bricks_stonecutting.json new file mode 100644 index 0000000000..3621f2252b --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/dark_stone_brick_stairs_from_dark_stone_bricks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "vampirism:dark_stone_bricks" + }, + "result": "vampirism:dark_stone_brick_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/dark_stone_brick_stairs_from_polished_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/recipes/dark_stone_brick_stairs_from_polished_dark_stone_stonecutting.json new file mode 100644 index 0000000000..4478e10f40 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/dark_stone_brick_stairs_from_polished_dark_stone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "vampirism:polished_dark_stone" + }, + "result": "vampirism:dark_stone_brick_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/dark_stone_brick_wall_from_cobbled_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/recipes/dark_stone_brick_wall_from_cobbled_dark_stone_stonecutting.json new file mode 100644 index 0000000000..4a87bcb7b5 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/dark_stone_brick_wall_from_cobbled_dark_stone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "vampirism:cobbled_dark_stone" + }, + "result": "vampirism:dark_stone_brick_wall" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/dark_stone_brick_wall_from_dark_stone_bricks_stonecutting.json b/src/generated/resources/data/minecraft/recipes/dark_stone_brick_wall_from_dark_stone_bricks_stonecutting.json new file mode 100644 index 0000000000..e2a3f550fd --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/dark_stone_brick_wall_from_dark_stone_bricks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "vampirism:dark_stone_bricks" + }, + "result": "vampirism:dark_stone_brick_wall" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/dark_stone_brick_wall_from_polished_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/recipes/dark_stone_brick_wall_from_polished_dark_stone_stonecutting.json new file mode 100644 index 0000000000..29cead947a --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/dark_stone_brick_wall_from_polished_dark_stone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "vampirism:polished_dark_stone" + }, + "result": "vampirism:dark_stone_brick_wall" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/dark_stone_bricks_from_cobbled_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/recipes/dark_stone_bricks_from_cobbled_dark_stone_stonecutting.json new file mode 100644 index 0000000000..0fbe73bf1b --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/dark_stone_bricks_from_cobbled_dark_stone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "vampirism:cobbled_dark_stone" + }, + "result": "vampirism:dark_stone_bricks" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/dark_stone_bricks_from_polished_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/recipes/dark_stone_bricks_from_polished_dark_stone_stonecutting.json new file mode 100644 index 0000000000..06a39ba81e --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/dark_stone_bricks_from_polished_dark_stone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "vampirism:polished_dark_stone" + }, + "result": "vampirism:dark_stone_bricks" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_from_cobbled_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_from_cobbled_dark_stone_stonecutting.json new file mode 100644 index 0000000000..68450bc415 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_from_cobbled_dark_stone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "vampirism:cobbled_dark_stone" + }, + "result": "vampirism:dark_stone_tiles" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_from_dark_stone_bricks_stonecutting.json b/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_from_dark_stone_bricks_stonecutting.json new file mode 100644 index 0000000000..4669d2f77b --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_from_dark_stone_bricks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "vampirism:dark_stone_bricks" + }, + "result": "vampirism:dark_stone_tiles" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_from_polished_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_from_polished_dark_stone_stonecutting.json new file mode 100644 index 0000000000..4d32fdbd42 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_from_polished_dark_stone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "vampirism:polished_dark_stone" + }, + "result": "vampirism:dark_stone_tiles" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_slab_from_cobbled_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_slab_from_cobbled_dark_stone_stonecutting.json new file mode 100644 index 0000000000..253f0e294a --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_slab_from_cobbled_dark_stone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 2, + "ingredient": { + "item": "vampirism:cobbled_dark_stone" + }, + "result": "vampirism:dark_stone_tiles_slab" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_slab_from_dark_stone_bricks_stonecutting.json b/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_slab_from_dark_stone_bricks_stonecutting.json new file mode 100644 index 0000000000..2af8a6e99c --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_slab_from_dark_stone_bricks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 2, + "ingredient": { + "item": "vampirism:dark_stone_bricks" + }, + "result": "vampirism:dark_stone_tiles_slab" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_slab_from_dark_stone_tiles_stonecutting.json b/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_slab_from_dark_stone_tiles_stonecutting.json new file mode 100644 index 0000000000..121c0c6b79 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_slab_from_dark_stone_tiles_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 2, + "ingredient": { + "item": "vampirism:dark_stone_tiles" + }, + "result": "vampirism:dark_stone_tiles_slab" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_stairs_from_cobbled_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_stairs_from_cobbled_dark_stone_stonecutting.json new file mode 100644 index 0000000000..76a5c38ca3 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_stairs_from_cobbled_dark_stone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "vampirism:cobbled_dark_stone" + }, + "result": "vampirism:dark_stone_tiles_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_stairs_from_dark_stone_bricks_stonecutting.json b/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_stairs_from_dark_stone_bricks_stonecutting.json new file mode 100644 index 0000000000..974ee1d5ee --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_stairs_from_dark_stone_bricks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "vampirism:dark_stone_bricks" + }, + "result": "vampirism:dark_stone_tiles_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_stairs_from_dark_stone_tiles_stonecutting.json b/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_stairs_from_dark_stone_tiles_stonecutting.json new file mode 100644 index 0000000000..8a56a37056 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_stairs_from_dark_stone_tiles_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "vampirism:dark_stone_tiles" + }, + "result": "vampirism:dark_stone_tiles_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_wall_from_cobbled_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_wall_from_cobbled_dark_stone_stonecutting.json new file mode 100644 index 0000000000..21aaf6477e --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_wall_from_cobbled_dark_stone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "vampirism:cobbled_dark_stone" + }, + "result": "vampirism:dark_stone_tiles_wall" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_wall_from_dark_stone_bricks_stonecutting.json b/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_wall_from_dark_stone_bricks_stonecutting.json new file mode 100644 index 0000000000..2b989556d0 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_wall_from_dark_stone_bricks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "vampirism:dark_stone_bricks" + }, + "result": "vampirism:dark_stone_tiles_wall" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_wall_from_dark_stone_tiles_stonecutting.json b/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_wall_from_dark_stone_tiles_stonecutting.json new file mode 100644 index 0000000000..bfe119cc8b --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/dark_stone_tiles_wall_from_dark_stone_tiles_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "vampirism:dark_stone_tiles" + }, + "result": "vampirism:dark_stone_tiles_wall" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/polished_dark_stone_from_cobbled_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/recipes/polished_dark_stone_from_cobbled_dark_stone_stonecutting.json new file mode 100644 index 0000000000..1cffd1f770 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/polished_dark_stone_from_cobbled_dark_stone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "vampirism:cobbled_dark_stone" + }, + "result": "vampirism:polished_dark_stone" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/polished_dark_stone_slab_from_cobbled_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/recipes/polished_dark_stone_slab_from_cobbled_dark_stone_stonecutting.json new file mode 100644 index 0000000000..57441dda2a --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/polished_dark_stone_slab_from_cobbled_dark_stone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 2, + "ingredient": { + "item": "vampirism:cobbled_dark_stone" + }, + "result": "vampirism:polished_dark_stone_slab" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/polished_dark_stone_slab_from_polished_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/recipes/polished_dark_stone_slab_from_polished_dark_stone_stonecutting.json new file mode 100644 index 0000000000..f47e9070c5 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/polished_dark_stone_slab_from_polished_dark_stone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 2, + "ingredient": { + "item": "vampirism:polished_dark_stone" + }, + "result": "vampirism:polished_dark_stone_slab" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/polished_dark_stone_stairs_from_cobbled_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/recipes/polished_dark_stone_stairs_from_cobbled_dark_stone_stonecutting.json new file mode 100644 index 0000000000..15fe529828 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/polished_dark_stone_stairs_from_cobbled_dark_stone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "vampirism:cobbled_dark_stone" + }, + "result": "vampirism:polished_dark_stone_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/polished_dark_stone_stairs_from_polished_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/recipes/polished_dark_stone_stairs_from_polished_dark_stone_stonecutting.json new file mode 100644 index 0000000000..55e9d664ed --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/polished_dark_stone_stairs_from_polished_dark_stone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "vampirism:polished_dark_stone" + }, + "result": "vampirism:polished_dark_stone_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/polished_dark_stone_wall_from_cobbled_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/recipes/polished_dark_stone_wall_from_cobbled_dark_stone_stonecutting.json new file mode 100644 index 0000000000..6133b98332 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/polished_dark_stone_wall_from_cobbled_dark_stone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "vampirism:cobbled_dark_stone" + }, + "result": "vampirism:polished_dark_stone_wall" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/polished_dark_stone_wall_from_polished_dark_stone_stonecutting.json b/src/generated/resources/data/minecraft/recipes/polished_dark_stone_wall_from_polished_dark_stone_stonecutting.json new file mode 100644 index 0000000000..9a989529e3 --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/polished_dark_stone_wall_from_polished_dark_stone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "vampirism:polished_dark_stone" + }, + "result": "vampirism:polished_dark_stone_wall" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 3afb8ab16b..97a2ccbdac 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -25,6 +25,11 @@ "#vampirism:castle_block", "#vampirism:castle_slaps", "#vampirism:castle_stairs", - "#vampirism:totem_top" + "#vampirism:totem_top", + "#vampirism:dark_stone", + "#vampirism:dark_stone_bricks", + "#vampirism:dark_brick_tiles", + "#vampirism:polished_dark_brick", + "#vampirism:cobbled_dark_brick" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/slabs.json b/src/generated/resources/data/minecraft/tags/blocks/slabs.json index e9da6ee684..2b324d603f 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/slabs.json +++ b/src/generated/resources/data/minecraft/tags/blocks/slabs.json @@ -1,5 +1,10 @@ { "values": [ - "#vampirism:castle_slaps" + "vampirism:dark_stone_brick_slab", + "vampirism:polished_dark_stone_slab", + "vampirism:cobbled_dark_stone_slab", + "vampirism:dark_stone_slab", + "vampirism:dark_stone_tiles_slab", + "vampirism:castle_slab_purple_brick" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/stairs.json b/src/generated/resources/data/minecraft/tags/blocks/stairs.json index ab7e2b54b5..a91490ad6b 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/stairs.json +++ b/src/generated/resources/data/minecraft/tags/blocks/stairs.json @@ -1,5 +1,10 @@ { "values": [ - "#vampirism:castle_stairs" + "vampirism:dark_stone_brick_stairs", + "vampirism:polished_dark_stone_stairs", + "vampirism:cobbled_dark_stone_stairs", + "vampirism:dark_stone_stairs", + "vampirism:dark_stone_tiles_stairs", + "vampirism:castle_stairs_purple_brick" ] } \ 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 index 4ace9f4ac8..a937586a5b 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/walls.json +++ b/src/generated/resources/data/minecraft/tags/blocks/walls.json @@ -1,6 +1,10 @@ { "values": [ - "vampirism:castle_block_dark_brick_wall", + "vampirism:dark_stone_brick_wall", + "vampirism:polished_dark_stone_wall", + "vampirism:cobbled_dark_stone_wall", + "vampirism:dark_stone_wall", + "vampirism:dark_stone_tiles_wall", "vampirism:castle_block_purple_brick_wall" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/slabs.json b/src/generated/resources/data/minecraft/tags/items/slabs.json index e9da6ee684..b1a5a60d05 100644 --- a/src/generated/resources/data/minecraft/tags/items/slabs.json +++ b/src/generated/resources/data/minecraft/tags/items/slabs.json @@ -1,5 +1,11 @@ { "values": [ - "#vampirism:castle_slaps" + "#vampirism:castle_slaps", + "vampirism:dark_stone_brick_slab", + "vampirism:polished_dark_stone_slab", + "vampirism:cobbled_dark_stone_slab", + "vampirism:dark_stone_slab", + "vampirism:dark_stone_tiles_slab", + "vampirism:castle_slab_purple_brick" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/stairs.json b/src/generated/resources/data/minecraft/tags/items/stairs.json index ab7e2b54b5..3d3a2acdc3 100644 --- a/src/generated/resources/data/minecraft/tags/items/stairs.json +++ b/src/generated/resources/data/minecraft/tags/items/stairs.json @@ -1,5 +1,11 @@ { "values": [ - "#vampirism:castle_stairs" + "#vampirism:castle_stairs", + "vampirism:dark_stone_brick_stairs", + "vampirism:polished_dark_stone_stairs", + "vampirism:cobbled_dark_stone_stairs", + "vampirism:dark_stone_stairs", + "vampirism:dark_stone_tiles_stairs", + "vampirism:castle_stairs_purple_brick" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/walls.json b/src/generated/resources/data/minecraft/tags/items/walls.json new file mode 100644 index 0000000000..a937586a5b --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/items/walls.json @@ -0,0 +1,10 @@ +{ + "values": [ + "vampirism:dark_stone_brick_wall", + "vampirism:polished_dark_stone_wall", + "vampirism:cobbled_dark_stone_wall", + "vampirism:dark_stone_wall", + "vampirism:dark_stone_tiles_wall", + "vampirism:castle_block_purple_brick_wall" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/castle_stairs_dark_stone.json b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/castle_stairs_dark_stone.json deleted file mode 100644 index e5b5b37d47..0000000000 --- a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/castle_stairs_dark_stone.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_castle_block_dark_stone": { - "conditions": { - "items": [ - { - "items": [ - "vampirism:castle_block_dark_stone" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "vampirism:castle_stairs_dark_stone" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_castle_block_dark_stone", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "vampirism:castle_stairs_dark_stone" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/castle_slab_dark_brick.json b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/chiseled_dark_stone_bricks.json similarity index 68% rename from src/generated/resources/data/vampirism/advancements/recipes/building_blocks/castle_slab_dark_brick.json rename to src/generated/resources/data/vampirism/advancements/recipes/building_blocks/chiseled_dark_stone_bricks.json index 21316bd029..8c53538758 100644 --- a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/castle_slab_dark_brick.json +++ b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/chiseled_dark_stone_bricks.json @@ -1,12 +1,12 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_castle_block_dark_brick": { + "has_dark_stone_brick_slab": { "conditions": { "items": [ { "items": [ - "vampirism:castle_block_dark_brick" + "vampirism:dark_stone_brick_slab" ] } ] @@ -15,20 +15,20 @@ }, "has_the_recipe": { "conditions": { - "recipe": "vampirism:castle_slab_dark_brick" + "recipe": "vampirism:chiseled_dark_stone_bricks" }, "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_castle_block_dark_brick", + "has_dark_stone_brick_slab", "has_the_recipe" ] ], "rewards": { "recipes": [ - "vampirism:castle_slab_dark_brick" + "vampirism:chiseled_dark_stone_bricks" ] }, "sends_telemetry_event": false diff --git a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/general/castle_slab_dark_stone.json b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/cobbled_dark_stone_slab.json similarity index 69% rename from src/generated/resources/data/vampirism/advancements/recipes/building_blocks/general/castle_slab_dark_stone.json rename to src/generated/resources/data/vampirism/advancements/recipes/building_blocks/cobbled_dark_stone_slab.json index 60080c0e95..93e69415b6 100644 --- a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/general/castle_slab_dark_stone.json +++ b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/cobbled_dark_stone_slab.json @@ -1,12 +1,12 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_castle_brick": { + "has_cobbled_dark_stone": { "conditions": { "items": [ { "items": [ - "vampirism:castle_block_dark_stone" + "vampirism:cobbled_dark_stone" ] } ] @@ -15,20 +15,20 @@ }, "has_the_recipe": { "conditions": { - "recipe": "vampirism:general/castle_slab_dark_stone" + "recipe": "vampirism:cobbled_dark_stone_slab" }, "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_castle_brick", + "has_cobbled_dark_stone", "has_the_recipe" ] ], "rewards": { "recipes": [ - "vampirism:general/castle_slab_dark_stone" + "vampirism:cobbled_dark_stone_slab" ] }, "sends_telemetry_event": false diff --git a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/cobbled_dark_stone_stairs.json b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/cobbled_dark_stone_stairs.json new file mode 100644 index 0000000000..620ea48d19 --- /dev/null +++ b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/cobbled_dark_stone_stairs.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cobbled_dark_stone": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:cobbled_dark_stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "vampirism:cobbled_dark_stone_stairs" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cobbled_dark_stone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "vampirism:cobbled_dark_stone_stairs" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/cracked_dark_stone_bricks.json b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/cracked_dark_stone_bricks.json new file mode 100644 index 0000000000..1367b1afcb --- /dev/null +++ b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/cracked_dark_stone_bricks.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dark_stone_bricks": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:dark_stone_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "vampirism:cracked_dark_stone_bricks" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_dark_stone_bricks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "vampirism:cracked_dark_stone_bricks" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/cracked_dark_stone_tiles.json b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/cracked_dark_stone_tiles.json new file mode 100644 index 0000000000..5f9b89d0f6 --- /dev/null +++ b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/cracked_dark_stone_tiles.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dark_stone_tiles": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:dark_stone_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "vampirism:cracked_dark_stone_tiles" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_dark_stone_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "vampirism:cracked_dark_stone_tiles" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/dark_stone_brick_slab.json b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/dark_stone_brick_slab.json new file mode 100644 index 0000000000..762fa9281b --- /dev/null +++ b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/dark_stone_brick_slab.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dark_stone_bricks": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:dark_stone_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "vampirism:dark_stone_brick_slab" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_dark_stone_bricks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "vampirism:dark_stone_brick_slab" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/dark_stone_brick_stairs.json b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/dark_stone_brick_stairs.json new file mode 100644 index 0000000000..dd6add6b17 --- /dev/null +++ b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/dark_stone_brick_stairs.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dark_stone_bricks": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:dark_stone_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "vampirism:dark_stone_brick_stairs" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_dark_stone_bricks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "vampirism:dark_stone_brick_stairs" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/castle_stairs_dark_brick.json b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/dark_stone_from_cobbled_dark_stone_blasting.json similarity index 66% rename from src/generated/resources/data/vampirism/advancements/recipes/building_blocks/castle_stairs_dark_brick.json rename to src/generated/resources/data/vampirism/advancements/recipes/building_blocks/dark_stone_from_cobbled_dark_stone_blasting.json index e866c6057b..58f60711c4 100644 --- a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/castle_stairs_dark_brick.json +++ b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/dark_stone_from_cobbled_dark_stone_blasting.json @@ -1,12 +1,12 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_castle_block_dark_brick": { + "has_cobbled_dark_stone": { "conditions": { "items": [ { "items": [ - "vampirism:castle_block_dark_brick" + "vampirism:cobbled_dark_stone" ] } ] @@ -15,20 +15,20 @@ }, "has_the_recipe": { "conditions": { - "recipe": "vampirism:castle_stairs_dark_brick" + "recipe": "vampirism:dark_stone_from_cobbled_dark_stone_blasting" }, "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_castle_block_dark_brick", + "has_cobbled_dark_stone", "has_the_recipe" ] ], "rewards": { "recipes": [ - "vampirism:castle_stairs_dark_brick" + "vampirism:dark_stone_from_cobbled_dark_stone_blasting" ] }, "sends_telemetry_event": false diff --git a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/castle_block_dark_brick_cracked.json b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/dark_stone_from_cobbled_dark_stone_smelting.json similarity index 66% rename from src/generated/resources/data/vampirism/advancements/recipes/building_blocks/castle_block_dark_brick_cracked.json rename to src/generated/resources/data/vampirism/advancements/recipes/building_blocks/dark_stone_from_cobbled_dark_stone_smelting.json index 6a93e7302a..7eb22c9c6f 100644 --- a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/castle_block_dark_brick_cracked.json +++ b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/dark_stone_from_cobbled_dark_stone_smelting.json @@ -1,12 +1,12 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_castle_block_dark_brick": { + "has_cobbled_dark_stone": { "conditions": { "items": [ { "items": [ - "vampirism:castle_block_dark_brick" + "vampirism:cobbled_dark_stone" ] } ] @@ -15,20 +15,20 @@ }, "has_the_recipe": { "conditions": { - "recipe": "vampirism:castle_block_dark_brick_cracked" + "recipe": "vampirism:dark_stone_from_cobbled_dark_stone_smelting" }, "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_castle_block_dark_brick", + "has_cobbled_dark_stone", "has_the_recipe" ] ], "rewards": { "recipes": [ - "vampirism:castle_block_dark_brick_cracked" + "vampirism:dark_stone_from_cobbled_dark_stone_smelting" ] }, "sends_telemetry_event": false diff --git a/src/generated/resources/data/vampirism/advancements/recipes/decorations/general/castle_block_dark_stone.json b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/dark_stone_slab.json similarity index 71% rename from src/generated/resources/data/vampirism/advancements/recipes/decorations/general/castle_block_dark_stone.json rename to src/generated/resources/data/vampirism/advancements/recipes/building_blocks/dark_stone_slab.json index ba1fabfb36..742c4360b6 100644 --- a/src/generated/resources/data/vampirism/advancements/recipes/decorations/general/castle_block_dark_stone.json +++ b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/dark_stone_slab.json @@ -1,12 +1,12 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_orchid": { + "has_dark_stone": { "conditions": { "items": [ { "items": [ - "vampirism:vampire_orchid" + "vampirism:dark_stone" ] } ] @@ -15,20 +15,20 @@ }, "has_the_recipe": { "conditions": { - "recipe": "vampirism:general/castle_block_dark_stone" + "recipe": "vampirism:dark_stone_slab" }, "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_orchid", + "has_dark_stone", "has_the_recipe" ] ], "rewards": { "recipes": [ - "vampirism:general/castle_block_dark_stone" + "vampirism:dark_stone_slab" ] }, "sends_telemetry_event": false diff --git a/src/generated/resources/data/vampirism/advancements/recipes/decorations/general/castle_block_normal_brick.json b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/dark_stone_stairs.json similarity index 70% rename from src/generated/resources/data/vampirism/advancements/recipes/decorations/general/castle_block_normal_brick.json rename to src/generated/resources/data/vampirism/advancements/recipes/building_blocks/dark_stone_stairs.json index 704535f863..dc29347d0b 100644 --- a/src/generated/resources/data/vampirism/advancements/recipes/decorations/general/castle_block_normal_brick.json +++ b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/dark_stone_stairs.json @@ -1,12 +1,12 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_orchid": { + "has_dark_stone": { "conditions": { "items": [ { "items": [ - "vampirism:vampire_orchid" + "vampirism:dark_stone" ] } ] @@ -15,20 +15,20 @@ }, "has_the_recipe": { "conditions": { - "recipe": "vampirism:general/castle_block_normal_brick" + "recipe": "vampirism:dark_stone_stairs" }, "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_orchid", + "has_dark_stone", "has_the_recipe" ] ], "rewards": { "recipes": [ - "vampirism:general/castle_block_normal_brick" + "vampirism:dark_stone_stairs" ] }, "sends_telemetry_event": false diff --git a/src/generated/resources/data/vampirism/advancements/recipes/decorations/general/castle_block_dark_brick_1.json b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/dark_stone_tiles_slab.json similarity index 70% rename from src/generated/resources/data/vampirism/advancements/recipes/decorations/general/castle_block_dark_brick_1.json rename to src/generated/resources/data/vampirism/advancements/recipes/building_blocks/dark_stone_tiles_slab.json index 7e71a2bf0e..91ef1034c4 100644 --- a/src/generated/resources/data/vampirism/advancements/recipes/decorations/general/castle_block_dark_brick_1.json +++ b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/dark_stone_tiles_slab.json @@ -1,12 +1,12 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_orchid": { + "has_dark_stone_tiles": { "conditions": { "items": [ { "items": [ - "vampirism:vampire_orchid" + "vampirism:dark_stone_tiles" ] } ] @@ -15,20 +15,20 @@ }, "has_the_recipe": { "conditions": { - "recipe": "vampirism:general/castle_block_dark_brick_1" + "recipe": "vampirism:dark_stone_tiles_slab" }, "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_orchid", + "has_dark_stone_tiles", "has_the_recipe" ] ], "rewards": { "recipes": [ - "vampirism:general/castle_block_dark_brick_1" + "vampirism:dark_stone_tiles_slab" ] }, "sends_telemetry_event": false diff --git a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/dark_stone_tiles_stairs.json b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/dark_stone_tiles_stairs.json new file mode 100644 index 0000000000..ad9b73c686 --- /dev/null +++ b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/dark_stone_tiles_stairs.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dark_stone_tiles": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:dark_stone_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "vampirism:dark_stone_tiles_stairs" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_dark_stone_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "vampirism:dark_stone_tiles_stairs" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/general/castle_stairs_dark_brick.json b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/general/castle_stairs_dark_brick.json deleted file mode 100644 index 47e2928292..0000000000 --- a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/general/castle_stairs_dark_brick.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_castle_brick": { - "conditions": { - "items": [ - { - "items": [ - "vampirism:castle_block_dark_brick" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "vampirism:general/castle_stairs_dark_brick" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_castle_brick", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "vampirism:general/castle_stairs_dark_brick" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/general/castle_stairs_dark_stone.json b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/general/castle_stairs_dark_stone.json deleted file mode 100644 index ec6e876a06..0000000000 --- a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/general/castle_stairs_dark_stone.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_castle_brick": { - "conditions": { - "items": [ - { - "items": [ - "vampirism:castle_block_dark_stone" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "vampirism:general/castle_stairs_dark_stone" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_castle_brick", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "vampirism:general/castle_stairs_dark_stone" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/polished_dark_stone.json b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/polished_dark_stone.json new file mode 100644 index 0000000000..b3153be9e8 --- /dev/null +++ b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/polished_dark_stone.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cobbled_dark_stone": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:cobbled_dark_stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "vampirism:polished_dark_stone" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cobbled_dark_stone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "vampirism:polished_dark_stone" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/polished_dark_stone_slab.json b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/polished_dark_stone_slab.json new file mode 100644 index 0000000000..1b6495c484 --- /dev/null +++ b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/polished_dark_stone_slab.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_polished_dark_stone": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:polished_dark_stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "vampirism:polished_dark_stone_slab" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_polished_dark_stone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "vampirism:polished_dark_stone_slab" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/general/castle_slab_dark_brick.json b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/polished_dark_stone_stairs.json similarity index 69% rename from src/generated/resources/data/vampirism/advancements/recipes/building_blocks/general/castle_slab_dark_brick.json rename to src/generated/resources/data/vampirism/advancements/recipes/building_blocks/polished_dark_stone_stairs.json index 3ba0c38c26..e34a0e52ee 100644 --- a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/general/castle_slab_dark_brick.json +++ b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/polished_dark_stone_stairs.json @@ -1,12 +1,12 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_castle_brick": { + "has_polished_dark_stone": { "conditions": { "items": [ { "items": [ - "vampirism:castle_block_dark_brick" + "vampirism:polished_dark_stone" ] } ] @@ -15,20 +15,20 @@ }, "has_the_recipe": { "conditions": { - "recipe": "vampirism:general/castle_slab_dark_brick" + "recipe": "vampirism:polished_dark_stone_stairs" }, "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_castle_brick", + "has_polished_dark_stone", "has_the_recipe" ] ], "rewards": { "recipes": [ - "vampirism:general/castle_slab_dark_brick" + "vampirism:polished_dark_stone_stairs" ] }, "sends_telemetry_event": false diff --git a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_block_dark_brick_from_castle_block_dark_brick.json b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_block_dark_brick_from_castle_block_dark_brick.json deleted file mode 100644 index 04c95154e7..0000000000 --- a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_block_dark_brick_from_castle_block_dark_brick.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_castle_stone": { - "conditions": { - "items": [ - { - "items": [ - "vampirism:castle_block_dark_stone" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "vampirism:stonecutting/castle_block_dark_brick_from_castle_block_dark_brick" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_castle_stone", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "vampirism:stonecutting/castle_block_dark_brick_from_castle_block_dark_brick" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_slaps_dark_brick_from_castle_block_dark_brick.json b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_slaps_dark_brick_from_castle_block_dark_brick.json deleted file mode 100644 index dd7d3e03b5..0000000000 --- a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_slaps_dark_brick_from_castle_block_dark_brick.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_stone": { - "conditions": { - "items": [ - { - "items": [ - "vampirism:castle_block_dark_brick" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "vampirism:stonecutting/castle_slaps_dark_brick_from_castle_block_dark_brick" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_stone", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "vampirism:stonecutting/castle_slaps_dark_brick_from_castle_block_dark_brick" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_slaps_dark_brick_from_castle_block_dark_stone.json b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_slaps_dark_brick_from_castle_block_dark_stone.json deleted file mode 100644 index 63619a267c..0000000000 --- a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_slaps_dark_brick_from_castle_block_dark_stone.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_stone": { - "conditions": { - "items": [ - { - "items": [ - "vampirism:castle_block_dark_stone" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "vampirism:stonecutting/castle_slaps_dark_brick_from_castle_block_dark_stone" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_stone", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "vampirism:stonecutting/castle_slaps_dark_brick_from_castle_block_dark_stone" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_slaps_dark_stone_from_castle_block_dark_brick.json b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_slaps_dark_stone_from_castle_block_dark_brick.json deleted file mode 100644 index e5b6e6caf0..0000000000 --- a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_slaps_dark_stone_from_castle_block_dark_brick.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_stone": { - "conditions": { - "items": [ - { - "items": [ - "vampirism:castle_block_dark_brick" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "vampirism:stonecutting/castle_slaps_dark_stone_from_castle_block_dark_brick" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_stone", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "vampirism:stonecutting/castle_slaps_dark_stone_from_castle_block_dark_brick" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_slaps_dark_stone_from_castle_block_dark_stone.json b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_slaps_dark_stone_from_castle_block_dark_stone.json deleted file mode 100644 index 497ca7b459..0000000000 --- a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_slaps_dark_stone_from_castle_block_dark_stone.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_stone": { - "conditions": { - "items": [ - { - "items": [ - "vampirism:castle_block_dark_stone" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "vampirism:stonecutting/castle_slaps_dark_stone_from_castle_block_dark_stone" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_stone", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "vampirism:stonecutting/castle_slaps_dark_stone_from_castle_block_dark_stone" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_stairs_dark_brick_from_castle_block_dark_brick.json b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_stairs_dark_brick_from_castle_block_dark_brick.json deleted file mode 100644 index ff4ae163c9..0000000000 --- a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_stairs_dark_brick_from_castle_block_dark_brick.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_stone": { - "conditions": { - "items": [ - { - "items": [ - "vampirism:castle_block_dark_brick" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "vampirism:stonecutting/castle_stairs_dark_brick_from_castle_block_dark_brick" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_stone", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "vampirism:stonecutting/castle_stairs_dark_brick_from_castle_block_dark_brick" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_stairs_dark_brick_from_castle_block_dark_stone.json b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_stairs_dark_brick_from_castle_block_dark_stone.json deleted file mode 100644 index c492673a9b..0000000000 --- a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_stairs_dark_brick_from_castle_block_dark_stone.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_stone": { - "conditions": { - "items": [ - { - "items": [ - "vampirism:castle_block_dark_stone" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "vampirism:stonecutting/castle_stairs_dark_brick_from_castle_block_dark_stone" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_stone", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "vampirism:stonecutting/castle_stairs_dark_brick_from_castle_block_dark_stone" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_stairs_dark_stone_from_castle_block_dark_brick.json b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_stairs_dark_stone_from_castle_block_dark_brick.json deleted file mode 100644 index 753fc11f31..0000000000 --- a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_stairs_dark_stone_from_castle_block_dark_brick.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_stone": { - "conditions": { - "items": [ - { - "items": [ - "vampirism:castle_block_dark_brick" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "vampirism:stonecutting/castle_stairs_dark_stone_from_castle_block_dark_brick" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_stone", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "vampirism:stonecutting/castle_stairs_dark_stone_from_castle_block_dark_brick" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_stairs_dark_stone_from_castle_block_dark_stone.json b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_stairs_dark_stone_from_castle_block_dark_stone.json deleted file mode 100644 index fcb4cf1586..0000000000 --- a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_stairs_dark_stone_from_castle_block_dark_stone.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_stone": { - "conditions": { - "items": [ - { - "items": [ - "vampirism:castle_block_dark_stone" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "vampirism:stonecutting/castle_stairs_dark_stone_from_castle_block_dark_stone" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_stone", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "vampirism:stonecutting/castle_stairs_dark_stone_from_castle_block_dark_stone" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_stairs_purple_brick_from_castle_block_purple_brick.json b/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_stairs_purple_brick_from_castle_block_purple_brick.json deleted file mode 100644 index a499bda264..0000000000 --- a/src/generated/resources/data/vampirism/advancements/recipes/building_blocks/stonecutting/castle_stairs_purple_brick_from_castle_block_purple_brick.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_stone": { - "conditions": { - "items": [ - { - "items": [ - "vampirism:castle_block_purple_brick" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "vampirism:stonecutting/castle_stairs_purple_brick_from_castle_block_purple_brick" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_stone", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "vampirism:stonecutting/castle_stairs_purple_brick_from_castle_block_purple_brick" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/advancements/recipes/decorations/castle_block_dark_brick_wall.json b/src/generated/resources/data/vampirism/advancements/recipes/decorations/castle_block_dark_brick_wall.json deleted file mode 100644 index 96d2db6ea6..0000000000 --- a/src/generated/resources/data/vampirism/advancements/recipes/decorations/castle_block_dark_brick_wall.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_castle_block_dark_brick": { - "conditions": { - "items": [ - { - "items": [ - "vampirism:castle_block_dark_brick" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "vampirism:castle_block_dark_brick_wall" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_castle_block_dark_brick", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "vampirism:castle_block_dark_brick_wall" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/advancements/recipes/decorations/cobbled_dark_stone_wall.json b/src/generated/resources/data/vampirism/advancements/recipes/decorations/cobbled_dark_stone_wall.json new file mode 100644 index 0000000000..3ebf71f2d7 --- /dev/null +++ b/src/generated/resources/data/vampirism/advancements/recipes/decorations/cobbled_dark_stone_wall.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cobbled_dark_stone": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:cobbled_dark_stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "vampirism:cobbled_dark_stone_wall" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cobbled_dark_stone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "vampirism:cobbled_dark_stone_wall" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/advancements/recipes/decorations/dark_stone_brick_wall.json b/src/generated/resources/data/vampirism/advancements/recipes/decorations/dark_stone_brick_wall.json new file mode 100644 index 0000000000..6cf0cfd20d --- /dev/null +++ b/src/generated/resources/data/vampirism/advancements/recipes/decorations/dark_stone_brick_wall.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dark_stone_bricks": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:dark_stone_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "vampirism:dark_stone_brick_wall" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_dark_stone_bricks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "vampirism:dark_stone_brick_wall" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/advancements/recipes/decorations/dark_stone_tiles_wall.json b/src/generated/resources/data/vampirism/advancements/recipes/decorations/dark_stone_tiles_wall.json new file mode 100644 index 0000000000..c0763d67cf --- /dev/null +++ b/src/generated/resources/data/vampirism/advancements/recipes/decorations/dark_stone_tiles_wall.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dark_stone_tiles": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:dark_stone_tiles" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "vampirism:dark_stone_tiles_wall" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_dark_stone_tiles", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "vampirism:dark_stone_tiles_wall" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/advancements/recipes/decorations/dark_stone_wall.json b/src/generated/resources/data/vampirism/advancements/recipes/decorations/dark_stone_wall.json new file mode 100644 index 0000000000..f16dcb55b6 --- /dev/null +++ b/src/generated/resources/data/vampirism/advancements/recipes/decorations/dark_stone_wall.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_dark_stone": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:dark_stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "vampirism:dark_stone_wall" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_dark_stone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "vampirism:dark_stone_wall" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/advancements/recipes/decorations/general/castle_block_dark_brick_0.json b/src/generated/resources/data/vampirism/advancements/recipes/decorations/general/castle_block_dark_brick_0.json deleted file mode 100644 index 26c3fc2e2c..0000000000 --- a/src/generated/resources/data/vampirism/advancements/recipes/decorations/general/castle_block_dark_brick_0.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_black_dye": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:black_dye" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_castle_brick": { - "conditions": { - "items": [ - { - "items": [ - "vampirism:castle_block_normal_brick" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "vampirism:general/castle_block_dark_brick_0" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_castle_brick", - "has_black_dye", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "vampirism:general/castle_block_dark_brick_0" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/advancements/recipes/decorations/polished_dark_stone_wall.json b/src/generated/resources/data/vampirism/advancements/recipes/decorations/polished_dark_stone_wall.json new file mode 100644 index 0000000000..27b94a793e --- /dev/null +++ b/src/generated/resources/data/vampirism/advancements/recipes/decorations/polished_dark_stone_wall.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_polished_dark_stone": { + "conditions": { + "items": [ + { + "items": [ + "vampirism:polished_dark_stone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "vampirism:polished_dark_stone_wall" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_polished_dark_stone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "vampirism:polished_dark_stone_wall" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/loot_tables/blocks/castle_stairs_dark_brick.json b/src/generated/resources/data/vampirism/loot_tables/blocks/bloody_dark_stone_bricks.json similarity index 71% rename from src/generated/resources/data/vampirism/loot_tables/blocks/castle_stairs_dark_brick.json rename to src/generated/resources/data/vampirism/loot_tables/blocks/bloody_dark_stone_bricks.json index f35f88c2e0..3b78a79121 100644 --- a/src/generated/resources/data/vampirism/loot_tables/blocks/castle_stairs_dark_brick.json +++ b/src/generated/resources/data/vampirism/loot_tables/blocks/bloody_dark_stone_bricks.json @@ -11,11 +11,11 @@ "entries": [ { "type": "minecraft:item", - "name": "vampirism:castle_stairs_dark_brick" + "name": "vampirism:bloody_dark_stone_bricks" } ], "rolls": 1.0 } ], - "random_sequence": "vampirism:blocks/castle_stairs_dark_brick" + "random_sequence": "vampirism:blocks/bloody_dark_stone_bricks" } \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/loot_tables/blocks/castle_block_dark_brick_bloody.json b/src/generated/resources/data/vampirism/loot_tables/blocks/castle_block_dark_brick_bloody.json deleted file mode 100644 index 213bf127a8..0000000000 --- a/src/generated/resources/data/vampirism/loot_tables/blocks/castle_block_dark_brick_bloody.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "vampirism:castle_block_dark_brick_bloody" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "vampirism:blocks/castle_block_dark_brick_bloody" -} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/loot_tables/blocks/castle_block_dark_brick_cracked.json b/src/generated/resources/data/vampirism/loot_tables/blocks/castle_block_dark_brick_cracked.json deleted file mode 100644 index 7f5fbbea43..0000000000 --- a/src/generated/resources/data/vampirism/loot_tables/blocks/castle_block_dark_brick_cracked.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "vampirism:castle_block_dark_brick_cracked" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "vampirism:blocks/castle_block_dark_brick_cracked" -} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/loot_tables/blocks/castle_block_dark_brick_wall.json b/src/generated/resources/data/vampirism/loot_tables/blocks/castle_block_dark_brick_wall.json deleted file mode 100644 index b2840d4046..0000000000 --- a/src/generated/resources/data/vampirism/loot_tables/blocks/castle_block_dark_brick_wall.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "vampirism:castle_block_dark_brick_wall" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "vampirism:blocks/castle_block_dark_brick_wall" -} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/loot_tables/blocks/chiseled_dark_stone_bricks.json b/src/generated/resources/data/vampirism/loot_tables/blocks/chiseled_dark_stone_bricks.json new file mode 100644 index 0000000000..c0d58bd62e --- /dev/null +++ b/src/generated/resources/data/vampirism/loot_tables/blocks/chiseled_dark_stone_bricks.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "vampirism:chiseled_dark_stone_bricks" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "vampirism:blocks/chiseled_dark_stone_bricks" +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/loot_tables/blocks/castle_slab_dark_brick.json b/src/generated/resources/data/vampirism/loot_tables/blocks/cobbled_dark_stone.json similarity index 71% rename from src/generated/resources/data/vampirism/loot_tables/blocks/castle_slab_dark_brick.json rename to src/generated/resources/data/vampirism/loot_tables/blocks/cobbled_dark_stone.json index 3f1a1e5988..a5240ebc1e 100644 --- a/src/generated/resources/data/vampirism/loot_tables/blocks/castle_slab_dark_brick.json +++ b/src/generated/resources/data/vampirism/loot_tables/blocks/cobbled_dark_stone.json @@ -11,11 +11,11 @@ "entries": [ { "type": "minecraft:item", - "name": "vampirism:castle_slab_dark_brick" + "name": "vampirism:cobbled_dark_stone" } ], "rolls": 1.0 } ], - "random_sequence": "vampirism:blocks/castle_slab_dark_brick" + "random_sequence": "vampirism:blocks/cobbled_dark_stone" } \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/loot_tables/blocks/castle_block_dark_stone.json b/src/generated/resources/data/vampirism/loot_tables/blocks/cobbled_dark_stone_slab.json similarity index 71% rename from src/generated/resources/data/vampirism/loot_tables/blocks/castle_block_dark_stone.json rename to src/generated/resources/data/vampirism/loot_tables/blocks/cobbled_dark_stone_slab.json index 5742d23a3c..b6b0dfe0c8 100644 --- a/src/generated/resources/data/vampirism/loot_tables/blocks/castle_block_dark_stone.json +++ b/src/generated/resources/data/vampirism/loot_tables/blocks/cobbled_dark_stone_slab.json @@ -11,11 +11,11 @@ "entries": [ { "type": "minecraft:item", - "name": "vampirism:castle_block_dark_stone" + "name": "vampirism:cobbled_dark_stone_slab" } ], "rolls": 1.0 } ], - "random_sequence": "vampirism:blocks/castle_block_dark_stone" + "random_sequence": "vampirism:blocks/cobbled_dark_stone_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/loot_tables/blocks/castle_block_normal_brick.json b/src/generated/resources/data/vampirism/loot_tables/blocks/cobbled_dark_stone_stairs.json similarity index 71% rename from src/generated/resources/data/vampirism/loot_tables/blocks/castle_block_normal_brick.json rename to src/generated/resources/data/vampirism/loot_tables/blocks/cobbled_dark_stone_stairs.json index ed6b108405..1e4ab091d4 100644 --- a/src/generated/resources/data/vampirism/loot_tables/blocks/castle_block_normal_brick.json +++ b/src/generated/resources/data/vampirism/loot_tables/blocks/cobbled_dark_stone_stairs.json @@ -11,11 +11,11 @@ "entries": [ { "type": "minecraft:item", - "name": "vampirism:castle_block_normal_brick" + "name": "vampirism:cobbled_dark_stone_stairs" } ], "rolls": 1.0 } ], - "random_sequence": "vampirism:blocks/castle_block_normal_brick" + "random_sequence": "vampirism:blocks/cobbled_dark_stone_stairs" } \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/loot_tables/blocks/castle_block_dark_brick.json b/src/generated/resources/data/vampirism/loot_tables/blocks/cobbled_dark_stone_wall.json similarity index 71% rename from src/generated/resources/data/vampirism/loot_tables/blocks/castle_block_dark_brick.json rename to src/generated/resources/data/vampirism/loot_tables/blocks/cobbled_dark_stone_wall.json index 41dcf66bed..f331a7cf6a 100644 --- a/src/generated/resources/data/vampirism/loot_tables/blocks/castle_block_dark_brick.json +++ b/src/generated/resources/data/vampirism/loot_tables/blocks/cobbled_dark_stone_wall.json @@ -11,11 +11,11 @@ "entries": [ { "type": "minecraft:item", - "name": "vampirism:castle_block_dark_brick" + "name": "vampirism:cobbled_dark_stone_wall" } ], "rolls": 1.0 } ], - "random_sequence": "vampirism:blocks/castle_block_dark_brick" + "random_sequence": "vampirism:blocks/cobbled_dark_stone_wall" } \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/loot_tables/blocks/cracked_dark_stone_bricks.json b/src/generated/resources/data/vampirism/loot_tables/blocks/cracked_dark_stone_bricks.json new file mode 100644 index 0000000000..fc8c83cf1b --- /dev/null +++ b/src/generated/resources/data/vampirism/loot_tables/blocks/cracked_dark_stone_bricks.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "vampirism:cracked_dark_stone_bricks" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "vampirism:blocks/cracked_dark_stone_bricks" +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/loot_tables/blocks/castle_stairs_dark_stone.json b/src/generated/resources/data/vampirism/loot_tables/blocks/cracked_dark_stone_tiles.json similarity index 71% rename from src/generated/resources/data/vampirism/loot_tables/blocks/castle_stairs_dark_stone.json rename to src/generated/resources/data/vampirism/loot_tables/blocks/cracked_dark_stone_tiles.json index b6f21dc358..414bf281ff 100644 --- a/src/generated/resources/data/vampirism/loot_tables/blocks/castle_stairs_dark_stone.json +++ b/src/generated/resources/data/vampirism/loot_tables/blocks/cracked_dark_stone_tiles.json @@ -11,11 +11,11 @@ "entries": [ { "type": "minecraft:item", - "name": "vampirism:castle_stairs_dark_stone" + "name": "vampirism:cracked_dark_stone_tiles" } ], "rolls": 1.0 } ], - "random_sequence": "vampirism:blocks/castle_stairs_dark_stone" + "random_sequence": "vampirism:blocks/cracked_dark_stone_tiles" } \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone.json b/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone.json new file mode 100644 index 0000000000..a2b63d7b56 --- /dev/null +++ b/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone.json @@ -0,0 +1,45 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "vampirism:dark_stone" + }, + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "name": "vampirism:cobbled_dark_stone" + } + ] + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "vampirism:blocks/dark_stone" +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/loot_tables/blocks/castle_slab_dark_stone.json b/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone_brick_slab.json similarity index 71% rename from src/generated/resources/data/vampirism/loot_tables/blocks/castle_slab_dark_stone.json rename to src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone_brick_slab.json index 21ae3abef0..7a8106c1a0 100644 --- a/src/generated/resources/data/vampirism/loot_tables/blocks/castle_slab_dark_stone.json +++ b/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone_brick_slab.json @@ -11,11 +11,11 @@ "entries": [ { "type": "minecraft:item", - "name": "vampirism:castle_slab_dark_stone" + "name": "vampirism:dark_stone_brick_slab" } ], "rolls": 1.0 } ], - "random_sequence": "vampirism:blocks/castle_slab_dark_stone" + "random_sequence": "vampirism:blocks/dark_stone_brick_slab" } \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone_brick_stairs.json b/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone_brick_stairs.json new file mode 100644 index 0000000000..56ea122288 --- /dev/null +++ b/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone_brick_stairs.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "vampirism:dark_stone_brick_stairs" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "vampirism:blocks/dark_stone_brick_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone_brick_wall.json b/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone_brick_wall.json new file mode 100644 index 0000000000..ce553ae9ef --- /dev/null +++ b/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone_brick_wall.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "vampirism:dark_stone_brick_wall" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "vampirism:blocks/dark_stone_brick_wall" +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone_bricks.json b/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone_bricks.json new file mode 100644 index 0000000000..9d081b7f78 --- /dev/null +++ b/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone_bricks.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "vampirism:dark_stone_bricks" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "vampirism:blocks/dark_stone_bricks" +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone_slab.json b/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone_slab.json new file mode 100644 index 0000000000..1cf1cf0e60 --- /dev/null +++ b/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone_slab.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "vampirism:dark_stone_slab" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "vampirism:blocks/dark_stone_slab" +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone_stairs.json b/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone_stairs.json new file mode 100644 index 0000000000..19a17a261c --- /dev/null +++ b/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone_stairs.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "vampirism:dark_stone_stairs" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "vampirism:blocks/dark_stone_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone_tiles.json b/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone_tiles.json new file mode 100644 index 0000000000..07cf3c20ff --- /dev/null +++ b/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone_tiles.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "vampirism:dark_stone_tiles" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "vampirism:blocks/dark_stone_tiles" +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone_tiles_slab.json b/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone_tiles_slab.json new file mode 100644 index 0000000000..0459063e33 --- /dev/null +++ b/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone_tiles_slab.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "vampirism:dark_stone_tiles_slab" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "vampirism:blocks/dark_stone_tiles_slab" +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone_tiles_stairs.json b/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone_tiles_stairs.json new file mode 100644 index 0000000000..7772831947 --- /dev/null +++ b/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone_tiles_stairs.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "vampirism:dark_stone_tiles_stairs" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "vampirism:blocks/dark_stone_tiles_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone_tiles_wall.json b/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone_tiles_wall.json new file mode 100644 index 0000000000..015b208c83 --- /dev/null +++ b/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone_tiles_wall.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "vampirism:dark_stone_tiles_wall" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "vampirism:blocks/dark_stone_tiles_wall" +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone_wall.json b/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone_wall.json new file mode 100644 index 0000000000..3bcfaca25a --- /dev/null +++ b/src/generated/resources/data/vampirism/loot_tables/blocks/dark_stone_wall.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "vampirism:dark_stone_wall" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "vampirism:blocks/dark_stone_wall" +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/loot_tables/blocks/infested_dark_stone.json b/src/generated/resources/data/vampirism/loot_tables/blocks/infested_dark_stone.json new file mode 100644 index 0000000000..09e1424d06 --- /dev/null +++ b/src/generated/resources/data/vampirism/loot_tables/blocks/infested_dark_stone.json @@ -0,0 +1,31 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "vampirism:dark_stone" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "vampirism:blocks/infested_dark_stone" +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/loot_tables/blocks/polished_dark_stone.json b/src/generated/resources/data/vampirism/loot_tables/blocks/polished_dark_stone.json new file mode 100644 index 0000000000..e02437723d --- /dev/null +++ b/src/generated/resources/data/vampirism/loot_tables/blocks/polished_dark_stone.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "vampirism:polished_dark_stone" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "vampirism:blocks/polished_dark_stone" +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/loot_tables/blocks/polished_dark_stone_slab.json b/src/generated/resources/data/vampirism/loot_tables/blocks/polished_dark_stone_slab.json new file mode 100644 index 0000000000..7290b81eaa --- /dev/null +++ b/src/generated/resources/data/vampirism/loot_tables/blocks/polished_dark_stone_slab.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "vampirism:polished_dark_stone_slab" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "vampirism:blocks/polished_dark_stone_slab" +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/loot_tables/blocks/polished_dark_stone_stairs.json b/src/generated/resources/data/vampirism/loot_tables/blocks/polished_dark_stone_stairs.json new file mode 100644 index 0000000000..c40018e5c8 --- /dev/null +++ b/src/generated/resources/data/vampirism/loot_tables/blocks/polished_dark_stone_stairs.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "vampirism:polished_dark_stone_stairs" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "vampirism:blocks/polished_dark_stone_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/loot_tables/blocks/polished_dark_stone_wall.json b/src/generated/resources/data/vampirism/loot_tables/blocks/polished_dark_stone_wall.json new file mode 100644 index 0000000000..d904ac9c91 --- /dev/null +++ b/src/generated/resources/data/vampirism/loot_tables/blocks/polished_dark_stone_wall.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "vampirism:polished_dark_stone_wall" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "vampirism:blocks/polished_dark_stone_wall" +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/chiseled_dark_stone_bricks.json b/src/generated/resources/data/vampirism/recipes/chiseled_dark_stone_bricks.json new file mode 100644 index 0000000000..b188f7619d --- /dev/null +++ b/src/generated/resources/data/vampirism/recipes/chiseled_dark_stone_bricks.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "vampirism:dark_stone_brick_slab" + } + }, + "pattern": [ + "#", + "#" + ], + "result": { + "item": "vampirism:chiseled_dark_stone_bricks" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/general/castle_slab_dark_brick.json b/src/generated/resources/data/vampirism/recipes/cobbled_dark_stone_slab.json similarity index 66% rename from src/generated/resources/data/vampirism/recipes/general/castle_slab_dark_brick.json rename to src/generated/resources/data/vampirism/recipes/cobbled_dark_stone_slab.json index 0838c437c6..46094460c4 100644 --- a/src/generated/resources/data/vampirism/recipes/general/castle_slab_dark_brick.json +++ b/src/generated/resources/data/vampirism/recipes/cobbled_dark_stone_slab.json @@ -3,7 +3,7 @@ "category": "building", "key": { "#": { - "item": "vampirism:castle_block_dark_brick" + "item": "vampirism:cobbled_dark_stone" } }, "pattern": [ @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "vampirism:castle_slab_dark_brick" + "item": "vampirism:cobbled_dark_stone_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/castle_stairs_dark_stone.json b/src/generated/resources/data/vampirism/recipes/cobbled_dark_stone_stairs.json similarity index 68% rename from src/generated/resources/data/vampirism/recipes/castle_stairs_dark_stone.json rename to src/generated/resources/data/vampirism/recipes/cobbled_dark_stone_stairs.json index 638265e331..c0571af071 100644 --- a/src/generated/resources/data/vampirism/recipes/castle_stairs_dark_stone.json +++ b/src/generated/resources/data/vampirism/recipes/cobbled_dark_stone_stairs.json @@ -3,7 +3,7 @@ "category": "building", "key": { "#": { - "item": "vampirism:castle_block_dark_stone" + "item": "vampirism:cobbled_dark_stone" } }, "pattern": [ @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "vampirism:castle_stairs_dark_stone" + "item": "vampirism:cobbled_dark_stone_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/castle_block_dark_brick_wall.json b/src/generated/resources/data/vampirism/recipes/cobbled_dark_stone_wall.json similarity index 66% rename from src/generated/resources/data/vampirism/recipes/castle_block_dark_brick_wall.json rename to src/generated/resources/data/vampirism/recipes/cobbled_dark_stone_wall.json index e53a669229..9c952db454 100644 --- a/src/generated/resources/data/vampirism/recipes/castle_block_dark_brick_wall.json +++ b/src/generated/resources/data/vampirism/recipes/cobbled_dark_stone_wall.json @@ -3,7 +3,7 @@ "category": "misc", "key": { "#": { - "item": "vampirism:castle_block_dark_brick" + "item": "vampirism:cobbled_dark_stone" } }, "pattern": [ @@ -12,7 +12,7 @@ ], "result": { "count": 6, - "item": "vampirism:castle_block_dark_brick_wall" + "item": "vampirism:cobbled_dark_stone_wall" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/castle_block_dark_brick_cracked.json b/src/generated/resources/data/vampirism/recipes/cracked_dark_stone_bricks.json similarity index 54% rename from src/generated/resources/data/vampirism/recipes/castle_block_dark_brick_cracked.json rename to src/generated/resources/data/vampirism/recipes/cracked_dark_stone_bricks.json index 15eb5cee27..14eca951c7 100644 --- a/src/generated/resources/data/vampirism/recipes/castle_block_dark_brick_cracked.json +++ b/src/generated/resources/data/vampirism/recipes/cracked_dark_stone_bricks.json @@ -4,7 +4,7 @@ "cookingtime": 200, "experience": 0.1, "ingredient": { - "item": "vampirism:castle_block_dark_brick" + "item": "vampirism:dark_stone_bricks" }, - "result": "vampirism:castle_block_dark_brick_cracked" + "result": "vampirism:cracked_dark_stone_bricks" } \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/cracked_dark_stone_tiles.json b/src/generated/resources/data/vampirism/recipes/cracked_dark_stone_tiles.json new file mode 100644 index 0000000000..69ec349a1c --- /dev/null +++ b/src/generated/resources/data/vampirism/recipes/cracked_dark_stone_tiles.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:smelting", + "category": "blocks", + "cookingtime": 200, + "experience": 0.1, + "ingredient": { + "item": "vampirism:dark_stone_tiles" + }, + "result": "vampirism:cracked_dark_stone_tiles" +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/castle_slab_dark_stone.json b/src/generated/resources/data/vampirism/recipes/dark_stone_brick_slab.json similarity index 66% rename from src/generated/resources/data/vampirism/recipes/castle_slab_dark_stone.json rename to src/generated/resources/data/vampirism/recipes/dark_stone_brick_slab.json index 369555f758..97a1afc130 100644 --- a/src/generated/resources/data/vampirism/recipes/castle_slab_dark_stone.json +++ b/src/generated/resources/data/vampirism/recipes/dark_stone_brick_slab.json @@ -3,7 +3,7 @@ "category": "building", "key": { "#": { - "item": "vampirism:castle_block_dark_stone" + "item": "vampirism:dark_stone_bricks" } }, "pattern": [ @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "vampirism:castle_slab_dark_stone" + "item": "vampirism:dark_stone_brick_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/general/castle_stairs_dark_brick.json b/src/generated/resources/data/vampirism/recipes/dark_stone_brick_stairs.json similarity index 68% rename from src/generated/resources/data/vampirism/recipes/general/castle_stairs_dark_brick.json rename to src/generated/resources/data/vampirism/recipes/dark_stone_brick_stairs.json index a264f811bc..e71f77e151 100644 --- a/src/generated/resources/data/vampirism/recipes/general/castle_stairs_dark_brick.json +++ b/src/generated/resources/data/vampirism/recipes/dark_stone_brick_stairs.json @@ -3,7 +3,7 @@ "category": "building", "key": { "#": { - "item": "vampirism:castle_block_dark_brick" + "item": "vampirism:dark_stone_bricks" } }, "pattern": [ @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "vampirism:castle_stairs_dark_brick" + "item": "vampirism:dark_stone_brick_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/dark_stone_brick_wall.json b/src/generated/resources/data/vampirism/recipes/dark_stone_brick_wall.json new file mode 100644 index 0000000000..fcf4f37a0e --- /dev/null +++ b/src/generated/resources/data/vampirism/recipes/dark_stone_brick_wall.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "vampirism:dark_stone_bricks" + } + }, + "pattern": [ + "###", + "###" + ], + "result": { + "count": 6, + "item": "vampirism:dark_stone_brick_wall" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/dark_stone_from_cobbled_dark_stone_blasting.json b/src/generated/resources/data/vampirism/recipes/dark_stone_from_cobbled_dark_stone_blasting.json new file mode 100644 index 0000000000..31aca1106c --- /dev/null +++ b/src/generated/resources/data/vampirism/recipes/dark_stone_from_cobbled_dark_stone_blasting.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:blasting", + "category": "blocks", + "cookingtime": 100, + "experience": 0.1, + "ingredient": { + "item": "vampirism:cobbled_dark_stone" + }, + "result": "vampirism:dark_stone" +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/dark_stone_from_cobbled_dark_stone_smelting.json b/src/generated/resources/data/vampirism/recipes/dark_stone_from_cobbled_dark_stone_smelting.json new file mode 100644 index 0000000000..fac55e45b5 --- /dev/null +++ b/src/generated/resources/data/vampirism/recipes/dark_stone_from_cobbled_dark_stone_smelting.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:smelting", + "category": "blocks", + "cookingtime": 200, + "experience": 0.1, + "ingredient": { + "item": "vampirism:cobbled_dark_stone" + }, + "result": "vampirism:dark_stone" +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/general/castle_slab_dark_stone.json b/src/generated/resources/data/vampirism/recipes/dark_stone_slab.json similarity index 66% rename from src/generated/resources/data/vampirism/recipes/general/castle_slab_dark_stone.json rename to src/generated/resources/data/vampirism/recipes/dark_stone_slab.json index 369555f758..db8c5ae30b 100644 --- a/src/generated/resources/data/vampirism/recipes/general/castle_slab_dark_stone.json +++ b/src/generated/resources/data/vampirism/recipes/dark_stone_slab.json @@ -3,7 +3,7 @@ "category": "building", "key": { "#": { - "item": "vampirism:castle_block_dark_stone" + "item": "vampirism:dark_stone" } }, "pattern": [ @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "vampirism:castle_slab_dark_stone" + "item": "vampirism:dark_stone_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/castle_stairs_dark_brick.json b/src/generated/resources/data/vampirism/recipes/dark_stone_stairs.json similarity index 68% rename from src/generated/resources/data/vampirism/recipes/castle_stairs_dark_brick.json rename to src/generated/resources/data/vampirism/recipes/dark_stone_stairs.json index a264f811bc..76920aaf94 100644 --- a/src/generated/resources/data/vampirism/recipes/castle_stairs_dark_brick.json +++ b/src/generated/resources/data/vampirism/recipes/dark_stone_stairs.json @@ -3,7 +3,7 @@ "category": "building", "key": { "#": { - "item": "vampirism:castle_block_dark_brick" + "item": "vampirism:dark_stone" } }, "pattern": [ @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "vampirism:castle_stairs_dark_brick" + "item": "vampirism:dark_stone_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/castle_slab_dark_brick.json b/src/generated/resources/data/vampirism/recipes/dark_stone_tiles_slab.json similarity index 66% rename from src/generated/resources/data/vampirism/recipes/castle_slab_dark_brick.json rename to src/generated/resources/data/vampirism/recipes/dark_stone_tiles_slab.json index 0838c437c6..7a26b4acb5 100644 --- a/src/generated/resources/data/vampirism/recipes/castle_slab_dark_brick.json +++ b/src/generated/resources/data/vampirism/recipes/dark_stone_tiles_slab.json @@ -3,7 +3,7 @@ "category": "building", "key": { "#": { - "item": "vampirism:castle_block_dark_brick" + "item": "vampirism:dark_stone_tiles" } }, "pattern": [ @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "vampirism:castle_slab_dark_brick" + "item": "vampirism:dark_stone_tiles_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/general/castle_stairs_dark_stone.json b/src/generated/resources/data/vampirism/recipes/dark_stone_tiles_stairs.json similarity index 68% rename from src/generated/resources/data/vampirism/recipes/general/castle_stairs_dark_stone.json rename to src/generated/resources/data/vampirism/recipes/dark_stone_tiles_stairs.json index 638265e331..386b7250dd 100644 --- a/src/generated/resources/data/vampirism/recipes/general/castle_stairs_dark_stone.json +++ b/src/generated/resources/data/vampirism/recipes/dark_stone_tiles_stairs.json @@ -3,7 +3,7 @@ "category": "building", "key": { "#": { - "item": "vampirism:castle_block_dark_stone" + "item": "vampirism:dark_stone_tiles" } }, "pattern": [ @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "vampirism:castle_stairs_dark_stone" + "item": "vampirism:dark_stone_tiles_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/dark_stone_tiles_wall.json b/src/generated/resources/data/vampirism/recipes/dark_stone_tiles_wall.json new file mode 100644 index 0000000000..da13316526 --- /dev/null +++ b/src/generated/resources/data/vampirism/recipes/dark_stone_tiles_wall.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "vampirism:dark_stone_tiles" + } + }, + "pattern": [ + "###", + "###" + ], + "result": { + "count": 6, + "item": "vampirism:dark_stone_tiles_wall" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/dark_stone_wall.json b/src/generated/resources/data/vampirism/recipes/dark_stone_wall.json new file mode 100644 index 0000000000..10bc6357c0 --- /dev/null +++ b/src/generated/resources/data/vampirism/recipes/dark_stone_wall.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "vampirism:dark_stone" + } + }, + "pattern": [ + "###", + "###" + ], + "result": { + "count": 6, + "item": "vampirism:dark_stone_wall" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/general/castle_block_dark_brick_0.json b/src/generated/resources/data/vampirism/recipes/general/castle_block_dark_brick_0.json deleted file mode 100644 index e34284f6c2..0000000000 --- a/src/generated/resources/data/vampirism/recipes/general/castle_block_dark_brick_0.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "item": "vampirism:castle_block_normal_brick" - }, - { - "item": "vampirism:castle_block_normal_brick" - }, - { - "item": "vampirism:castle_block_normal_brick" - }, - { - "item": "vampirism:castle_block_normal_brick" - }, - { - "item": "vampirism:castle_block_normal_brick" - }, - { - "item": "vampirism:castle_block_normal_brick" - }, - { - "item": "vampirism:castle_block_normal_brick" - }, - { - "item": "vampirism:castle_block_normal_brick" - }, - { - "item": "minecraft:black_dye" - } - ], - "result": { - "count": 8, - "item": "vampirism:castle_block_dark_brick" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/general/castle_block_dark_brick_1.json b/src/generated/resources/data/vampirism/recipes/general/castle_block_dark_brick_1.json deleted file mode 100644 index d0c988a363..0000000000 --- a/src/generated/resources/data/vampirism/recipes/general/castle_block_dark_brick_1.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "item": "minecraft:stone_bricks" - }, - { - "item": "minecraft:stone_bricks" - }, - { - "item": "minecraft:stone_bricks" - }, - { - "item": "minecraft:stone_bricks" - }, - { - "item": "minecraft:stone_bricks" - }, - { - "item": "minecraft:stone_bricks" - }, - { - "item": "minecraft:stone_bricks" - }, - { - "item": "minecraft:black_dye" - }, - { - "item": "vampirism:vampire_orchid" - } - ], - "result": { - "count": 7, - "item": "vampirism:castle_block_dark_brick" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/general/castle_block_dark_stone.json b/src/generated/resources/data/vampirism/recipes/general/castle_block_dark_stone.json deleted file mode 100644 index aa59fabe71..0000000000 --- a/src/generated/resources/data/vampirism/recipes/general/castle_block_dark_stone.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "item": "minecraft:stone" - }, - { - "item": "minecraft:stone" - }, - { - "item": "minecraft:stone" - }, - { - "item": "minecraft:stone" - }, - { - "item": "minecraft:stone" - }, - { - "item": "minecraft:stone" - }, - { - "item": "minecraft:stone" - }, - { - "item": "minecraft:black_dye" - }, - { - "item": "vampirism:vampire_orchid" - } - ], - "result": { - "count": 7, - "item": "vampirism:castle_block_dark_stone" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/general/castle_block_normal_brick.json b/src/generated/resources/data/vampirism/recipes/general/castle_block_normal_brick.json deleted file mode 100644 index 264f3f42dc..0000000000 --- a/src/generated/resources/data/vampirism/recipes/general/castle_block_normal_brick.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "item": "minecraft:stone_bricks" - }, - { - "item": "minecraft:stone_bricks" - }, - { - "item": "minecraft:stone_bricks" - }, - { - "item": "minecraft:stone_bricks" - }, - { - "item": "minecraft:stone_bricks" - }, - { - "item": "minecraft:stone_bricks" - }, - { - "item": "minecraft:stone_bricks" - }, - { - "item": "minecraft:stone_bricks" - }, - { - "item": "vampirism:vampire_orchid" - } - ], - "result": { - "count": 8, - "item": "vampirism:castle_block_normal_brick" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/general/castle_block_purple_brick.json b/src/generated/resources/data/vampirism/recipes/general/castle_block_purple_brick.json index 1e72f9197a..cf5e387a60 100644 --- a/src/generated/resources/data/vampirism/recipes/general/castle_block_purple_brick.json +++ b/src/generated/resources/data/vampirism/recipes/general/castle_block_purple_brick.json @@ -3,28 +3,28 @@ "category": "misc", "ingredients": [ { - "item": "vampirism:castle_block_normal_brick" + "item": "minecraft:stone_bricks" }, { - "item": "vampirism:castle_block_normal_brick" + "item": "minecraft:stone_bricks" }, { - "item": "vampirism:castle_block_normal_brick" + "item": "minecraft:stone_bricks" }, { - "item": "vampirism:castle_block_normal_brick" + "item": "minecraft:stone_bricks" }, { - "item": "vampirism:castle_block_normal_brick" + "item": "minecraft:stone_bricks" }, { - "item": "vampirism:castle_block_normal_brick" + "item": "minecraft:stone_bricks" }, { - "item": "vampirism:castle_block_normal_brick" + "item": "minecraft:stone_bricks" }, { - "item": "vampirism:castle_block_normal_brick" + "item": "minecraft:stone_bricks" }, { "item": "vampirism:vampire_orchid" diff --git a/src/generated/resources/data/vampirism/recipes/polished_dark_stone.json b/src/generated/resources/data/vampirism/recipes/polished_dark_stone.json new file mode 100644 index 0000000000..01539e0593 --- /dev/null +++ b/src/generated/resources/data/vampirism/recipes/polished_dark_stone.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "S": { + "item": "vampirism:cobbled_dark_stone" + } + }, + "pattern": [ + "SS", + "SS" + ], + "result": { + "count": 4, + "item": "vampirism:polished_dark_stone" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/polished_dark_stone_slab.json b/src/generated/resources/data/vampirism/recipes/polished_dark_stone_slab.json new file mode 100644 index 0000000000..1604736eec --- /dev/null +++ b/src/generated/resources/data/vampirism/recipes/polished_dark_stone_slab.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "vampirism:polished_dark_stone" + } + }, + "pattern": [ + "###" + ], + "result": { + "count": 6, + "item": "vampirism:polished_dark_stone_slab" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/polished_dark_stone_stairs.json b/src/generated/resources/data/vampirism/recipes/polished_dark_stone_stairs.json new file mode 100644 index 0000000000..de6eb21412 --- /dev/null +++ b/src/generated/resources/data/vampirism/recipes/polished_dark_stone_stairs.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "vampirism:polished_dark_stone" + } + }, + "pattern": [ + "# ", + "## ", + "###" + ], + "result": { + "count": 4, + "item": "vampirism:polished_dark_stone_stairs" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/polished_dark_stone_wall.json b/src/generated/resources/data/vampirism/recipes/polished_dark_stone_wall.json new file mode 100644 index 0000000000..99e08118ad --- /dev/null +++ b/src/generated/resources/data/vampirism/recipes/polished_dark_stone_wall.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "item": "vampirism:polished_dark_stone" + } + }, + "pattern": [ + "###", + "###" + ], + "result": { + "count": 6, + "item": "vampirism:polished_dark_stone_wall" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/stonecutting/castle_block_dark_brick_from_castle_block_dark_brick.json b/src/generated/resources/data/vampirism/recipes/stonecutting/castle_block_dark_brick_from_castle_block_dark_brick.json deleted file mode 100644 index bc221da1c6..0000000000 --- a/src/generated/resources/data/vampirism/recipes/stonecutting/castle_block_dark_brick_from_castle_block_dark_brick.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 1, - "ingredient": { - "item": "vampirism:castle_block_dark_stone" - }, - "result": "vampirism:castle_block_dark_brick" -} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/stonecutting/castle_slaps_dark_brick_from_castle_block_dark_brick.json b/src/generated/resources/data/vampirism/recipes/stonecutting/castle_slaps_dark_brick_from_castle_block_dark_brick.json deleted file mode 100644 index ddd6a903c0..0000000000 --- a/src/generated/resources/data/vampirism/recipes/stonecutting/castle_slaps_dark_brick_from_castle_block_dark_brick.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 2, - "ingredient": { - "item": "vampirism:castle_block_dark_brick" - }, - "result": "vampirism:castle_slab_dark_brick" -} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/stonecutting/castle_slaps_dark_brick_from_castle_block_dark_stone.json b/src/generated/resources/data/vampirism/recipes/stonecutting/castle_slaps_dark_brick_from_castle_block_dark_stone.json deleted file mode 100644 index 3340d4f8e8..0000000000 --- a/src/generated/resources/data/vampirism/recipes/stonecutting/castle_slaps_dark_brick_from_castle_block_dark_stone.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 2, - "ingredient": { - "item": "vampirism:castle_block_dark_stone" - }, - "result": "vampirism:castle_slab_dark_brick" -} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/stonecutting/castle_slaps_dark_stone_from_castle_block_dark_brick.json b/src/generated/resources/data/vampirism/recipes/stonecutting/castle_slaps_dark_stone_from_castle_block_dark_brick.json deleted file mode 100644 index c4da924571..0000000000 --- a/src/generated/resources/data/vampirism/recipes/stonecutting/castle_slaps_dark_stone_from_castle_block_dark_brick.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 2, - "ingredient": { - "item": "vampirism:castle_block_dark_brick" - }, - "result": "vampirism:castle_slab_dark_stone" -} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/stonecutting/castle_slaps_dark_stone_from_castle_block_dark_stone.json b/src/generated/resources/data/vampirism/recipes/stonecutting/castle_slaps_dark_stone_from_castle_block_dark_stone.json deleted file mode 100644 index 8bc8693045..0000000000 --- a/src/generated/resources/data/vampirism/recipes/stonecutting/castle_slaps_dark_stone_from_castle_block_dark_stone.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 2, - "ingredient": { - "item": "vampirism:castle_block_dark_stone" - }, - "result": "vampirism:castle_slab_dark_stone" -} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/stonecutting/castle_stairs_dark_brick_from_castle_block_dark_brick.json b/src/generated/resources/data/vampirism/recipes/stonecutting/castle_stairs_dark_brick_from_castle_block_dark_brick.json deleted file mode 100644 index 22bb1f5730..0000000000 --- a/src/generated/resources/data/vampirism/recipes/stonecutting/castle_stairs_dark_brick_from_castle_block_dark_brick.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 1, - "ingredient": { - "item": "vampirism:castle_block_dark_brick" - }, - "result": "vampirism:castle_stairs_dark_brick" -} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/stonecutting/castle_stairs_dark_brick_from_castle_block_dark_stone.json b/src/generated/resources/data/vampirism/recipes/stonecutting/castle_stairs_dark_brick_from_castle_block_dark_stone.json deleted file mode 100644 index 3f14673dfc..0000000000 --- a/src/generated/resources/data/vampirism/recipes/stonecutting/castle_stairs_dark_brick_from_castle_block_dark_stone.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 1, - "ingredient": { - "item": "vampirism:castle_block_dark_stone" - }, - "result": "vampirism:castle_stairs_dark_brick" -} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/stonecutting/castle_stairs_dark_stone_from_castle_block_dark_brick.json b/src/generated/resources/data/vampirism/recipes/stonecutting/castle_stairs_dark_stone_from_castle_block_dark_brick.json deleted file mode 100644 index 1d64749d0d..0000000000 --- a/src/generated/resources/data/vampirism/recipes/stonecutting/castle_stairs_dark_stone_from_castle_block_dark_brick.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 1, - "ingredient": { - "item": "vampirism:castle_block_dark_brick" - }, - "result": "vampirism:castle_stairs_dark_stone" -} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/stonecutting/castle_stairs_dark_stone_from_castle_block_dark_stone.json b/src/generated/resources/data/vampirism/recipes/stonecutting/castle_stairs_dark_stone_from_castle_block_dark_stone.json deleted file mode 100644 index 262436a1d6..0000000000 --- a/src/generated/resources/data/vampirism/recipes/stonecutting/castle_stairs_dark_stone_from_castle_block_dark_stone.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 1, - "ingredient": { - "item": "vampirism:castle_block_dark_stone" - }, - "result": "vampirism:castle_stairs_dark_stone" -} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/recipes/stonecutting/castle_stairs_purple_brick_from_castle_block_purple_brick.json b/src/generated/resources/data/vampirism/recipes/stonecutting/castle_stairs_purple_brick_from_castle_block_purple_brick.json deleted file mode 100644 index a14b718514..0000000000 --- a/src/generated/resources/data/vampirism/recipes/stonecutting/castle_stairs_purple_brick_from_castle_block_purple_brick.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 1, - "ingredient": { - "item": "vampirism:castle_block_purple_brick" - }, - "result": "vampirism:castle_stairs_purple_brick" -} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/tags/blocks/castle_block.json b/src/generated/resources/data/vampirism/tags/blocks/castle_block.json index 65a602ed81..c1de674973 100644 --- a/src/generated/resources/data/vampirism/tags/blocks/castle_block.json +++ b/src/generated/resources/data/vampirism/tags/blocks/castle_block.json @@ -1,10 +1,9 @@ { "values": [ - "vampirism:castle_block_dark_brick", - "vampirism:castle_block_dark_brick_bloody", - "vampirism:castle_block_dark_stone", - "vampirism:castle_block_normal_brick", + "vampirism:dark_stone_bricks", + "vampirism:bloody_dark_stone_bricks", + "vampirism:dark_stone", "vampirism:castle_block_purple_brick", - "vampirism:castle_block_dark_brick_cracked" + "vampirism:cracked_dark_stone_bricks" ] } \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/tags/blocks/castle_slaps.json b/src/generated/resources/data/vampirism/tags/blocks/castle_slaps.json index 62e1b7ad78..3b10b5eb6d 100644 --- a/src/generated/resources/data/vampirism/tags/blocks/castle_slaps.json +++ b/src/generated/resources/data/vampirism/tags/blocks/castle_slaps.json @@ -1,7 +1,7 @@ { "values": [ - "vampirism:castle_slab_dark_brick", - "vampirism:castle_slab_dark_stone", + "vampirism:dark_stone_brick_slab", + "vampirism:dark_stone_slab", "vampirism:castle_slab_purple_brick" ] } \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/tags/blocks/castle_stairs.json b/src/generated/resources/data/vampirism/tags/blocks/castle_stairs.json index c716b7b00c..85b01774fb 100644 --- a/src/generated/resources/data/vampirism/tags/blocks/castle_stairs.json +++ b/src/generated/resources/data/vampirism/tags/blocks/castle_stairs.json @@ -1,7 +1,7 @@ { "values": [ - "vampirism:castle_stairs_dark_stone", - "vampirism:castle_stairs_dark_brick", + "vampirism:dark_stone_stairs", + "vampirism:dark_stone_brick_stairs", "vampirism:castle_stairs_purple_brick" ] } \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/tags/blocks/cobbled_dark_brick.json b/src/generated/resources/data/vampirism/tags/blocks/cobbled_dark_brick.json new file mode 100644 index 0000000000..95b6fc9b23 --- /dev/null +++ b/src/generated/resources/data/vampirism/tags/blocks/cobbled_dark_brick.json @@ -0,0 +1,8 @@ +{ + "values": [ + "vampirism:cobbled_dark_stone", + "vampirism:cobbled_dark_stone_stairs", + "vampirism:cobbled_dark_stone_slab", + "vampirism:polished_dark_stone_wall" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/tags/blocks/dark_brick_tiles.json b/src/generated/resources/data/vampirism/tags/blocks/dark_brick_tiles.json new file mode 100644 index 0000000000..aede31eca2 --- /dev/null +++ b/src/generated/resources/data/vampirism/tags/blocks/dark_brick_tiles.json @@ -0,0 +1,9 @@ +{ + "values": [ + "vampirism:dark_stone_tiles", + "vampirism:dark_stone_tiles_stairs", + "vampirism:dark_stone_tiles_slab", + "vampirism:dark_stone_tiles_wall", + "vampirism:cracked_dark_stone_tiles" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/tags/blocks/dark_stone.json b/src/generated/resources/data/vampirism/tags/blocks/dark_stone.json new file mode 100644 index 0000000000..9d61ba6041 --- /dev/null +++ b/src/generated/resources/data/vampirism/tags/blocks/dark_stone.json @@ -0,0 +1,10 @@ +{ + "values": [ + "vampirism:dark_stone", + "vampirism:dark_stone_stairs", + "vampirism:dark_stone_wall", + "vampirism:dark_stone_slab", + "vampirism:dark_stone_tiles", + "vampirism:infested_dark_stone" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/tags/blocks/dark_stone_bricks.json b/src/generated/resources/data/vampirism/tags/blocks/dark_stone_bricks.json new file mode 100644 index 0000000000..f152be6cc5 --- /dev/null +++ b/src/generated/resources/data/vampirism/tags/blocks/dark_stone_bricks.json @@ -0,0 +1,11 @@ +{ + "values": [ + "vampirism:dark_stone_bricks", + "vampirism:dark_stone_brick_wall", + "vampirism:dark_stone_brick_slab", + "vampirism:dark_stone_stairs", + "vampirism:chiseled_dark_stone_bricks", + "vampirism:bloody_dark_stone_bricks", + "vampirism:cracked_dark_stone_bricks" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/tags/blocks/no_spawn.json b/src/generated/resources/data/vampirism/tags/blocks/no_spawn.json new file mode 100644 index 0000000000..2206ead800 --- /dev/null +++ b/src/generated/resources/data/vampirism/tags/blocks/no_spawn.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#vampirism:dark_stone" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/tags/blocks/polished_dark_brick.json b/src/generated/resources/data/vampirism/tags/blocks/polished_dark_brick.json new file mode 100644 index 0000000000..2223bad0db --- /dev/null +++ b/src/generated/resources/data/vampirism/tags/blocks/polished_dark_brick.json @@ -0,0 +1,8 @@ +{ + "values": [ + "vampirism:polished_dark_stone", + "vampirism:polished_dark_stone_stairs", + "vampirism:polished_dark_stone_slab", + "vampirism:polished_dark_stone_wall" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/tags/blocks/vampire_spawn.json b/src/generated/resources/data/vampirism/tags/blocks/vampire_spawn.json new file mode 100644 index 0000000000..f8a23107df --- /dev/null +++ b/src/generated/resources/data/vampirism/tags/blocks/vampire_spawn.json @@ -0,0 +1,8 @@ +{ + "values": [ + "#vampirism:dark_stone_bricks", + "#vampirism:cobbled_dark_brick", + "#vampirism:polished_dark_brick", + "#vampirism:dark_brick_tiles" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/tags/items/castle_block.json b/src/generated/resources/data/vampirism/tags/items/castle_block.json index 65a602ed81..c1de674973 100644 --- a/src/generated/resources/data/vampirism/tags/items/castle_block.json +++ b/src/generated/resources/data/vampirism/tags/items/castle_block.json @@ -1,10 +1,9 @@ { "values": [ - "vampirism:castle_block_dark_brick", - "vampirism:castle_block_dark_brick_bloody", - "vampirism:castle_block_dark_stone", - "vampirism:castle_block_normal_brick", + "vampirism:dark_stone_bricks", + "vampirism:bloody_dark_stone_bricks", + "vampirism:dark_stone", "vampirism:castle_block_purple_brick", - "vampirism:castle_block_dark_brick_cracked" + "vampirism:cracked_dark_stone_bricks" ] } \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/tags/items/castle_slaps.json b/src/generated/resources/data/vampirism/tags/items/castle_slaps.json index 62e1b7ad78..3b10b5eb6d 100644 --- a/src/generated/resources/data/vampirism/tags/items/castle_slaps.json +++ b/src/generated/resources/data/vampirism/tags/items/castle_slaps.json @@ -1,7 +1,7 @@ { "values": [ - "vampirism:castle_slab_dark_brick", - "vampirism:castle_slab_dark_stone", + "vampirism:dark_stone_brick_slab", + "vampirism:dark_stone_slab", "vampirism:castle_slab_purple_brick" ] } \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/tags/items/castle_stairs.json b/src/generated/resources/data/vampirism/tags/items/castle_stairs.json index c716b7b00c..85b01774fb 100644 --- a/src/generated/resources/data/vampirism/tags/items/castle_stairs.json +++ b/src/generated/resources/data/vampirism/tags/items/castle_stairs.json @@ -1,7 +1,7 @@ { "values": [ - "vampirism:castle_stairs_dark_stone", - "vampirism:castle_stairs_dark_brick", + "vampirism:dark_stone_stairs", + "vampirism:dark_stone_brick_stairs", "vampirism:castle_stairs_purple_brick" ] } \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/tags/items/cobbled_dark_brick.json b/src/generated/resources/data/vampirism/tags/items/cobbled_dark_brick.json new file mode 100644 index 0000000000..95b6fc9b23 --- /dev/null +++ b/src/generated/resources/data/vampirism/tags/items/cobbled_dark_brick.json @@ -0,0 +1,8 @@ +{ + "values": [ + "vampirism:cobbled_dark_stone", + "vampirism:cobbled_dark_stone_stairs", + "vampirism:cobbled_dark_stone_slab", + "vampirism:polished_dark_stone_wall" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/tags/items/dark_brick_tiles.json b/src/generated/resources/data/vampirism/tags/items/dark_brick_tiles.json new file mode 100644 index 0000000000..aede31eca2 --- /dev/null +++ b/src/generated/resources/data/vampirism/tags/items/dark_brick_tiles.json @@ -0,0 +1,9 @@ +{ + "values": [ + "vampirism:dark_stone_tiles", + "vampirism:dark_stone_tiles_stairs", + "vampirism:dark_stone_tiles_slab", + "vampirism:dark_stone_tiles_wall", + "vampirism:cracked_dark_stone_tiles" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/tags/items/dark_stone.json b/src/generated/resources/data/vampirism/tags/items/dark_stone.json new file mode 100644 index 0000000000..9d61ba6041 --- /dev/null +++ b/src/generated/resources/data/vampirism/tags/items/dark_stone.json @@ -0,0 +1,10 @@ +{ + "values": [ + "vampirism:dark_stone", + "vampirism:dark_stone_stairs", + "vampirism:dark_stone_wall", + "vampirism:dark_stone_slab", + "vampirism:dark_stone_tiles", + "vampirism:infested_dark_stone" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/tags/items/dark_stone_bricks.json b/src/generated/resources/data/vampirism/tags/items/dark_stone_bricks.json new file mode 100644 index 0000000000..f152be6cc5 --- /dev/null +++ b/src/generated/resources/data/vampirism/tags/items/dark_stone_bricks.json @@ -0,0 +1,11 @@ +{ + "values": [ + "vampirism:dark_stone_bricks", + "vampirism:dark_stone_brick_wall", + "vampirism:dark_stone_brick_slab", + "vampirism:dark_stone_stairs", + "vampirism:chiseled_dark_stone_bricks", + "vampirism:bloody_dark_stone_bricks", + "vampirism:cracked_dark_stone_bricks" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/tags/items/no_spawn.json b/src/generated/resources/data/vampirism/tags/items/no_spawn.json new file mode 100644 index 0000000000..2206ead800 --- /dev/null +++ b/src/generated/resources/data/vampirism/tags/items/no_spawn.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#vampirism:dark_stone" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/tags/items/polished_dark_brick.json b/src/generated/resources/data/vampirism/tags/items/polished_dark_brick.json new file mode 100644 index 0000000000..2223bad0db --- /dev/null +++ b/src/generated/resources/data/vampirism/tags/items/polished_dark_brick.json @@ -0,0 +1,8 @@ +{ + "values": [ + "vampirism:polished_dark_stone", + "vampirism:polished_dark_stone_stairs", + "vampirism:polished_dark_stone_slab", + "vampirism:polished_dark_stone_wall" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/tags/items/vampire_spawn.json b/src/generated/resources/data/vampirism/tags/items/vampire_spawn.json new file mode 100644 index 0000000000..f8a23107df --- /dev/null +++ b/src/generated/resources/data/vampirism/tags/items/vampire_spawn.json @@ -0,0 +1,8 @@ +{ + "values": [ + "#vampirism:dark_stone_bricks", + "#vampirism:cobbled_dark_brick", + "#vampirism:polished_dark_brick", + "#vampirism:dark_brick_tiles" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/vampirism/vampirism/tasks/feeding_adapter.json b/src/generated/resources/data/vampirism/vampirism/tasks/feeding_adapter.json index 3ebcc240cd..388b842d65 100644 --- a/src/generated/resources/data/vampirism/vampirism/tasks/feeding_adapter.json +++ b/src/generated/resources/data/vampirism/vampirism/tasks/feeding_adapter.json @@ -1,15 +1,6 @@ { "requirements": { "requirements": [ - { - "type": "vampirism:entity_type", - "amount": 10, - "description": { - "translate": "entity_tag.vampirism.advanced_hunter" - }, - "entityType": "vampirism:advanced_hunter", - "id": "vampirism:advanced_hunter" - }, { "type": "vampirism:item", "description": { @@ -20,6 +11,15 @@ "Count": 5, "id": "minecraft:gold_ingot" } + }, + { + "type": "vampirism:entity_type", + "amount": 10, + "description": { + "translate": "entity_tag.vampirism.advanced_hunter" + }, + "entityType": "vampirism:advanced_hunter", + "id": "vampirism:advanced_hunter" } ] }, diff --git a/src/generated/resources/data/vampirism/vampirism/tasks/fire_resistance1.json b/src/generated/resources/data/vampirism/vampirism/tasks/fire_resistance1.json index ba5f7f9b62..4c856ee421 100644 --- a/src/generated/resources/data/vampirism/vampirism/tasks/fire_resistance1.json +++ b/src/generated/resources/data/vampirism/vampirism/tasks/fire_resistance1.json @@ -1,15 +1,6 @@ { "requirements": { "requirements": [ - { - "type": "vampirism:entity_type", - "amount": 10, - "description": { - "translate": "entity_tag.vampirism.hunter" - }, - "entityType": "vampirism:hunter", - "id": "vampirism:hunter" - }, { "type": "vampirism:item", "description": { @@ -20,6 +11,15 @@ "Count": 3, "id": "minecraft:magma_cream" } + }, + { + "type": "vampirism:entity_type", + "amount": 10, + "description": { + "translate": "entity_tag.vampirism.hunter" + }, + "entityType": "vampirism:hunter", + "id": "vampirism:hunter" } ] }, diff --git a/src/generated/resources/data/vampirism/vampirism/tasks/fire_resistance2.json b/src/generated/resources/data/vampirism/vampirism/tasks/fire_resistance2.json index ce1d8fecc6..acf69364f4 100644 --- a/src/generated/resources/data/vampirism/vampirism/tasks/fire_resistance2.json +++ b/src/generated/resources/data/vampirism/vampirism/tasks/fire_resistance2.json @@ -1,15 +1,6 @@ { "requirements": { "requirements": [ - { - "type": "vampirism:entity_type", - "amount": 15, - "description": { - "translate": "entity_tag.vampirism.hunter" - }, - "entityType": "vampirism:hunter", - "id": "vampirism:hunter" - }, { "type": "vampirism:item", "description": { @@ -20,6 +11,15 @@ "Count": 5, "id": "minecraft:magma_cream" } + }, + { + "type": "vampirism:entity_type", + "amount": 15, + "description": { + "translate": "entity_tag.vampirism.hunter" + }, + "entityType": "vampirism:hunter", + "id": "vampirism:hunter" } ] }, diff --git a/src/generated/resources/data/vampirism/vampirism/tasks/hunter_lord1.json b/src/generated/resources/data/vampirism/vampirism/tasks/hunter_lord1.json index 4c25c7bc20..ab6279faab 100644 --- a/src/generated/resources/data/vampirism/vampirism/tasks/hunter_lord1.json +++ b/src/generated/resources/data/vampirism/vampirism/tasks/hunter_lord1.json @@ -1,15 +1,6 @@ { "requirements": { "requirements": [ - { - "type": "vampirism:entity_type", - "amount": 50, - "description": { - "translate": "entity_tag.vampirism.vampire" - }, - "entityType": "vampirism:vampire", - "id": "vampirism:vampire" - }, { "type": "vampirism:stat", "amount": 3, @@ -29,6 +20,15 @@ "Count": 32, "id": "minecraft:gold_ingot" } + }, + { + "type": "vampirism:entity_type", + "amount": 50, + "description": { + "translate": "entity_tag.vampirism.vampire" + }, + "entityType": "vampirism:vampire", + "id": "vampirism:vampire" } ] }, diff --git a/src/generated/resources/data/vampirism/vampirism/tasks/hunter_lord2.json b/src/generated/resources/data/vampirism/vampirism/tasks/hunter_lord2.json index 42d2b293d7..e9b23e0ab6 100644 --- a/src/generated/resources/data/vampirism/vampirism/tasks/hunter_lord2.json +++ b/src/generated/resources/data/vampirism/vampirism/tasks/hunter_lord2.json @@ -1,15 +1,6 @@ { "requirements": { "requirements": [ - { - "type": "vampirism:entity_type", - "amount": 50, - "description": { - "translate": "entity_tag.vampirism.vampire" - }, - "entityType": "vampirism:vampire", - "id": "vampirism:vampire" - }, { "type": "vampirism:item", "description": { @@ -20,6 +11,15 @@ "Count": 32, "id": "minecraft:gold_ingot" } + }, + { + "type": "vampirism:entity_type", + "amount": 50, + "description": { + "translate": "entity_tag.vampirism.vampire" + }, + "entityType": "vampirism:vampire", + "id": "vampirism:vampire" } ] }, diff --git a/src/generated/resources/data/vampirism/vampirism/tasks/hunter_lord3.json b/src/generated/resources/data/vampirism/vampirism/tasks/hunter_lord3.json index 7f828116ec..f4439af8c8 100644 --- a/src/generated/resources/data/vampirism/vampirism/tasks/hunter_lord3.json +++ b/src/generated/resources/data/vampirism/vampirism/tasks/hunter_lord3.json @@ -1,15 +1,6 @@ { "requirements": { "requirements": [ - { - "type": "vampirism:entity_type", - "amount": 50, - "description": { - "translate": "entity_tag.vampirism.vampire" - }, - "entityType": "vampirism:vampire", - "id": "vampirism:vampire" - }, { "type": "vampirism:item", "description": { @@ -20,6 +11,15 @@ "Count": 32, "id": "minecraft:gold_ingot" } + }, + { + "type": "vampirism:entity_type", + "amount": 50, + "description": { + "translate": "entity_tag.vampirism.vampire" + }, + "entityType": "vampirism:vampire", + "id": "vampirism:vampire" } ] }, diff --git a/src/generated/resources/data/vampirism/vampirism/tasks/hunter_lord4.json b/src/generated/resources/data/vampirism/vampirism/tasks/hunter_lord4.json index 8863c3a74c..5a53a37620 100644 --- a/src/generated/resources/data/vampirism/vampirism/tasks/hunter_lord4.json +++ b/src/generated/resources/data/vampirism/vampirism/tasks/hunter_lord4.json @@ -1,15 +1,6 @@ { "requirements": { "requirements": [ - { - "type": "vampirism:entity_type", - "amount": 75, - "description": { - "translate": "entity_tag.vampirism.vampire" - }, - "entityType": "vampirism:vampire", - "id": "vampirism:vampire" - }, { "type": "vampirism:item", "description": { @@ -20,6 +11,15 @@ "Count": 64, "id": "minecraft:gold_ingot" } + }, + { + "type": "vampirism:entity_type", + "amount": 75, + "description": { + "translate": "entity_tag.vampirism.vampire" + }, + "entityType": "vampirism:vampire", + "id": "vampirism:vampire" } ] }, diff --git a/src/generated/resources/data/vampirism/vampirism/tasks/hunter_lord5.json b/src/generated/resources/data/vampirism/vampirism/tasks/hunter_lord5.json index 266395f110..ab295d82ae 100644 --- a/src/generated/resources/data/vampirism/vampirism/tasks/hunter_lord5.json +++ b/src/generated/resources/data/vampirism/vampirism/tasks/hunter_lord5.json @@ -1,15 +1,6 @@ { "requirements": { "requirements": [ - { - "type": "vampirism:entity_type", - "amount": 100, - "description": { - "translate": "entity_tag.vampirism.vampire" - }, - "entityType": "vampirism:vampire", - "id": "vampirism:vampire" - }, { "type": "vampirism:stat", "amount": 6, @@ -29,6 +20,15 @@ "Count": 64, "id": "minecraft:gold_ingot" } + }, + { + "type": "vampirism:entity_type", + "amount": 100, + "description": { + "translate": "entity_tag.vampirism.vampire" + }, + "entityType": "vampirism:vampire", + "id": "vampirism:vampire" } ] }, diff --git a/src/generated/resources/data/vampirism/vampirism/tasks/hunter_minion_equipment.json b/src/generated/resources/data/vampirism/vampirism/tasks/hunter_minion_equipment.json index d65776b0c1..b7841c785f 100644 --- a/src/generated/resources/data/vampirism/vampirism/tasks/hunter_minion_equipment.json +++ b/src/generated/resources/data/vampirism/vampirism/tasks/hunter_minion_equipment.json @@ -1,15 +1,6 @@ { "requirements": { "requirements": [ - { - "type": "vampirism:entity_type", - "amount": 4, - "description": { - "translate": "entity_tag.vampirism.advanced_vampire" - }, - "entityType": "vampirism:advanced_vampire", - "id": "vampirism:advanced_vampire" - }, { "type": "vampirism:item", "description": { @@ -29,6 +20,15 @@ }, "entityType": "vampirism:vampire_baron", "id": "vampirism:vampire_baron" + }, + { + "type": "vampirism:entity_type", + "amount": 4, + "description": { + "translate": "entity_tag.vampirism.advanced_vampire" + }, + "entityType": "vampirism:advanced_vampire", + "id": "vampirism:advanced_vampire" } ] }, diff --git a/src/generated/resources/data/vampirism/vampirism/tasks/hunter_minion_upgrade_simple.json b/src/generated/resources/data/vampirism/vampirism/tasks/hunter_minion_upgrade_simple.json index e40816bfa5..f2bc02f691 100644 --- a/src/generated/resources/data/vampirism/vampirism/tasks/hunter_minion_upgrade_simple.json +++ b/src/generated/resources/data/vampirism/vampirism/tasks/hunter_minion_upgrade_simple.json @@ -1,15 +1,6 @@ { "requirements": { "requirements": [ - { - "type": "vampirism:entity_type", - "amount": 8, - "description": { - "translate": "entity_tag.vampirism.advanced_vampire" - }, - "entityType": "vampirism:advanced_vampire", - "id": "vampirism:advanced_vampire" - }, { "type": "vampirism:item", "description": { @@ -20,6 +11,15 @@ "Count": 16, "id": "minecraft:gold_block" } + }, + { + "type": "vampirism:entity_type", + "amount": 8, + "description": { + "translate": "entity_tag.vampirism.advanced_vampire" + }, + "entityType": "vampirism:advanced_vampire", + "id": "vampirism:advanced_vampire" } ] }, diff --git a/src/generated/resources/data/vampirism/vampirism/tasks/random_refinement1.json b/src/generated/resources/data/vampirism/vampirism/tasks/random_refinement1.json index f687d4c923..dc7712f84a 100644 --- a/src/generated/resources/data/vampirism/vampirism/tasks/random_refinement1.json +++ b/src/generated/resources/data/vampirism/vampirism/tasks/random_refinement1.json @@ -1,15 +1,6 @@ { "requirements": { "requirements": [ - { - "type": "vampirism:entity_type", - "amount": 10, - "description": { - "translate": "entity_tag.vampirism.advanced_hunter" - }, - "entityType": "vampirism:advanced_hunter", - "id": "vampirism:advanced_hunter" - }, { "type": "vampirism:item", "description": { @@ -20,6 +11,15 @@ "Count": 2, "id": "minecraft:gold_ingot" } + }, + { + "type": "vampirism:entity_type", + "amount": 10, + "description": { + "translate": "entity_tag.vampirism.advanced_hunter" + }, + "entityType": "vampirism:advanced_hunter", + "id": "vampirism:advanced_hunter" } ] }, diff --git a/src/generated/resources/data/vampirism/vampirism/tasks/random_refinement3.json b/src/generated/resources/data/vampirism/vampirism/tasks/random_refinement3.json index 95c6671f46..045b35c590 100644 --- a/src/generated/resources/data/vampirism/vampirism/tasks/random_refinement3.json +++ b/src/generated/resources/data/vampirism/vampirism/tasks/random_refinement3.json @@ -1,6 +1,15 @@ { "requirements": { "requirements": [ + { + "type": "vampirism:stat", + "amount": 15, + "description": { + "translate": "stat.minecraft.traded_with_villager" + }, + "id": "minecraft:traded_with_villager", + "stat": "minecraft:traded_with_villager" + }, { "type": "vampirism:item", "description": { @@ -11,15 +20,6 @@ "Count": 2, "id": "minecraft:gold_ingot" } - }, - { - "type": "vampirism:stat", - "amount": 15, - "description": { - "translate": "stat.minecraft.traded_with_villager" - }, - "id": "minecraft:traded_with_villager", - "stat": "minecraft:traded_with_villager" } ] }, diff --git a/src/generated/resources/data/vampirism/vampirism/tasks/totem_top.json b/src/generated/resources/data/vampirism/vampirism/tasks/totem_top.json index 3fe834f351..8d5a9678c7 100644 --- a/src/generated/resources/data/vampirism/vampirism/tasks/totem_top.json +++ b/src/generated/resources/data/vampirism/vampirism/tasks/totem_top.json @@ -1,15 +1,6 @@ { "requirements": { "requirements": [ - { - "type": "vampirism:entity_type", - "amount": 32, - "description": { - "translate": "entity_tag.vampirism.zombies" - }, - "entityType": "vampirism:zombies", - "id": "vampirism:zombies" - }, { "type": "vampirism:item", "description": { @@ -31,6 +22,15 @@ "Count": 32, "id": "minecraft:obsidian" } + }, + { + "type": "vampirism:entity_type", + "amount": 32, + "description": { + "translate": "entity_tag.vampirism.zombies" + }, + "entityType": "vampirism:zombies", + "id": "vampirism:zombies" } ] }, diff --git a/src/generated/resources/data/vampirism/vampirism/tasks/vampire_lord1.json b/src/generated/resources/data/vampirism/vampirism/tasks/vampire_lord1.json index 32f902ad73..daf21266d0 100644 --- a/src/generated/resources/data/vampirism/vampirism/tasks/vampire_lord1.json +++ b/src/generated/resources/data/vampirism/vampirism/tasks/vampire_lord1.json @@ -1,6 +1,24 @@ { "requirements": { "requirements": [ + { + "type": "vampirism:stat", + "amount": 25, + "description": { + "translate": "stat.vampirism.infected_creatures" + }, + "id": "vampirism:infected_creatures", + "stat": "vampirism:infected_creatures" + }, + { + "type": "vampirism:stat", + "amount": 3, + "description": { + "translate": "stat.vampirism.win_village_capture" + }, + "id": "vampirism:win_village_capture", + "stat": "vampirism:win_village_capture" + }, { "type": "vampirism:item", "description": { @@ -22,24 +40,6 @@ "Count": 5, "id": "vampirism:pure_blood_4" } - }, - { - "type": "vampirism:stat", - "amount": 25, - "description": { - "translate": "stat.vampirism.infected_creatures" - }, - "id": "vampirism:infected_creatures", - "stat": "vampirism:infected_creatures" - }, - { - "type": "vampirism:stat", - "amount": 3, - "description": { - "translate": "stat.vampirism.win_village_capture" - }, - "id": "vampirism:win_village_capture", - "stat": "vampirism:win_village_capture" } ] }, diff --git a/src/generated/resources/data/vampirism/vampirism/tasks/vampire_lord2.json b/src/generated/resources/data/vampirism/vampirism/tasks/vampire_lord2.json index 305168c682..8df9e08704 100644 --- a/src/generated/resources/data/vampirism/vampirism/tasks/vampire_lord2.json +++ b/src/generated/resources/data/vampirism/vampirism/tasks/vampire_lord2.json @@ -1,15 +1,6 @@ { "requirements": { "requirements": [ - { - "type": "vampirism:entity_type", - "amount": 30, - "description": { - "translate": "entity_tag.vampirism.hunter" - }, - "entityType": "vampirism:hunter", - "id": "vampirism:hunter" - }, { "type": "vampirism:item", "description": { @@ -31,6 +22,15 @@ "Count": 5, "id": "vampirism:pure_blood_4" } + }, + { + "type": "vampirism:entity_type", + "amount": 30, + "description": { + "translate": "entity_tag.vampirism.hunter" + }, + "entityType": "vampirism:hunter", + "id": "vampirism:hunter" } ] }, diff --git a/src/generated/resources/data/vampirism/vampirism/tasks/vampire_lord3.json b/src/generated/resources/data/vampirism/vampirism/tasks/vampire_lord3.json index 99f52c2d37..77950a1227 100644 --- a/src/generated/resources/data/vampirism/vampirism/tasks/vampire_lord3.json +++ b/src/generated/resources/data/vampirism/vampirism/tasks/vampire_lord3.json @@ -1,15 +1,6 @@ { "requirements": { "requirements": [ - { - "type": "vampirism:entity_type", - "amount": 30, - "description": { - "translate": "entity_tag.vampirism.hunter" - }, - "entityType": "vampirism:hunter", - "id": "vampirism:hunter" - }, { "type": "vampirism:item", "description": { @@ -31,6 +22,15 @@ "Count": 5, "id": "vampirism:pure_blood_4" } + }, + { + "type": "vampirism:entity_type", + "amount": 30, + "description": { + "translate": "entity_tag.vampirism.hunter" + }, + "entityType": "vampirism:hunter", + "id": "vampirism:hunter" } ] }, diff --git a/src/generated/resources/data/vampirism/vampirism/tasks/vampire_lord4.json b/src/generated/resources/data/vampirism/vampirism/tasks/vampire_lord4.json index af9e1353d7..39d18a7ce5 100644 --- a/src/generated/resources/data/vampirism/vampirism/tasks/vampire_lord4.json +++ b/src/generated/resources/data/vampirism/vampirism/tasks/vampire_lord4.json @@ -1,15 +1,6 @@ { "requirements": { "requirements": [ - { - "type": "vampirism:entity_type", - "amount": 5, - "description": { - "translate": "entity_tag.vampirism.advanced_hunter" - }, - "entityType": "vampirism:advanced_hunter", - "id": "vampirism:advanced_hunter" - }, { "type": "vampirism:item", "description": { @@ -31,6 +22,15 @@ "Count": 10, "id": "vampirism:pure_blood_4" } + }, + { + "type": "vampirism:entity_type", + "amount": 5, + "description": { + "translate": "entity_tag.vampirism.advanced_hunter" + }, + "entityType": "vampirism:advanced_hunter", + "id": "vampirism:advanced_hunter" } ] }, diff --git a/src/generated/resources/data/vampirism/vampirism/tasks/vampire_lord5.json b/src/generated/resources/data/vampirism/vampirism/tasks/vampire_lord5.json index 60ec951b61..f57e4c0402 100644 --- a/src/generated/resources/data/vampirism/vampirism/tasks/vampire_lord5.json +++ b/src/generated/resources/data/vampirism/vampirism/tasks/vampire_lord5.json @@ -1,6 +1,24 @@ { "requirements": { "requirements": [ + { + "type": "vampirism:stat", + "amount": 50, + "description": { + "translate": "stat.vampirism.infected_creatures" + }, + "id": "vampirism:infected_creatures", + "stat": "vampirism:infected_creatures" + }, + { + "type": "vampirism:stat", + "amount": 6, + "description": { + "translate": "stat.vampirism.capture_village" + }, + "id": "vampirism:capture_village", + "stat": "vampirism:capture_village" + }, { "type": "vampirism:item", "description": { @@ -22,24 +40,6 @@ "Count": 20, "id": "vampirism:pure_blood_4" } - }, - { - "type": "vampirism:stat", - "amount": 50, - "description": { - "translate": "stat.vampirism.infected_creatures" - }, - "id": "vampirism:infected_creatures", - "stat": "vampirism:infected_creatures" - }, - { - "type": "vampirism:stat", - "amount": 6, - "description": { - "translate": "stat.vampirism.capture_village" - }, - "id": "vampirism:capture_village", - "stat": "vampirism:capture_village" } ] }, diff --git a/src/generated/resources/data/vampirism/vampirism/tasks/vampire_minion_binding.json b/src/generated/resources/data/vampirism/vampirism/tasks/vampire_minion_binding.json index c509ca34a3..3064d12d69 100644 --- a/src/generated/resources/data/vampirism/vampirism/tasks/vampire_minion_binding.json +++ b/src/generated/resources/data/vampirism/vampirism/tasks/vampire_minion_binding.json @@ -1,15 +1,6 @@ { "requirements": { "requirements": [ - { - "type": "vampirism:entity_type", - "amount": 4, - "description": { - "translate": "entity_tag.vampirism.advanced_hunter" - }, - "entityType": "vampirism:advanced_hunter", - "id": "vampirism:advanced_hunter" - }, { "type": "vampirism:item", "description": { @@ -29,6 +20,15 @@ }, "entityType": "vampirism:vampire_baron", "id": "vampirism:vampire_baron" + }, + { + "type": "vampirism:entity_type", + "amount": 4, + "description": { + "translate": "entity_tag.vampirism.advanced_hunter" + }, + "entityType": "vampirism:advanced_hunter", + "id": "vampirism:advanced_hunter" } ] }, diff --git a/src/generated/resources/data/vampirism/vampirism/tasks/vampire_minion_upgrade_simple.json b/src/generated/resources/data/vampirism/vampirism/tasks/vampire_minion_upgrade_simple.json index 609d873c2c..42029b6c12 100644 --- a/src/generated/resources/data/vampirism/vampirism/tasks/vampire_minion_upgrade_simple.json +++ b/src/generated/resources/data/vampirism/vampirism/tasks/vampire_minion_upgrade_simple.json @@ -1,15 +1,6 @@ { "requirements": { "requirements": [ - { - "type": "vampirism:entity_type", - "amount": 8, - "description": { - "translate": "entity_tag.vampirism.advanced_hunter" - }, - "entityType": "vampirism:advanced_hunter", - "id": "vampirism:advanced_hunter" - }, { "type": "vampirism:item", "description": { @@ -20,6 +11,15 @@ "Count": 16, "id": "minecraft:gold_block" } + }, + { + "type": "vampirism:entity_type", + "amount": 8, + "description": { + "translate": "entity_tag.vampirism.advanced_hunter" + }, + "entityType": "vampirism:advanced_hunter", + "id": "vampirism:advanced_hunter" } ] }, diff --git a/src/generated/resources/data/vampirism/worldgen/biome/vampire_forest.json b/src/generated/resources/data/vampirism/worldgen/biome/vampire_forest.json index 2722fe5399..d6f920fe7d 100644 --- a/src/generated/resources/data/vampirism/worldgen/biome/vampire_forest.json +++ b/src/generated/resources/data/vampirism/worldgen/biome/vampire_forest.json @@ -67,8 +67,7 @@ [ "minecraft:ore_gravel", "vampirism:ore_cursed_dirt", - "vampirism:ore_dark_stone_lower", - "vampirism:ore_dark_stone_upper" + "vampirism:ore_dark_stone_lower" ], [ "minecraft:spring_water" @@ -107,13 +106,13 @@ "type": "vampirism:vampire", "maxCount": 3, "minCount": 1, - "weight": 35 + "weight": 80 }, { "type": "vampirism:vampire_baron", "maxCount": 1, "minCount": 1, - "weight": 10 + "weight": 27 } ], "underground_water_creature": [], diff --git a/src/generated/resources/data/vampirism/worldgen/configured_feature/mod_lake.json b/src/generated/resources/data/vampirism/worldgen/configured_feature/mod_lake.json index 860d6be0de..5d9df5a32e 100644 --- a/src/generated/resources/data/vampirism/worldgen/configured_feature/mod_lake.json +++ b/src/generated/resources/data/vampirism/worldgen/configured_feature/mod_lake.json @@ -4,7 +4,7 @@ "barrier": { "type": "minecraft:simple_state_provider", "state": { - "Name": "vampirism:castle_block_dark_stone" + "Name": "vampirism:dark_stone" } }, "fluid": { diff --git a/src/generated/resources/data/vampirism/worldgen/configured_feature/ore_dark_stone.json b/src/generated/resources/data/vampirism/worldgen/configured_feature/ore_dark_stone.json index d415744acf..9ad4a42b8f 100644 --- a/src/generated/resources/data/vampirism/worldgen/configured_feature/ore_dark_stone.json +++ b/src/generated/resources/data/vampirism/worldgen/configured_feature/ore_dark_stone.json @@ -6,7 +6,7 @@ "targets": [ { "state": { - "Name": "vampirism:castle_block_dark_stone" + "Name": "vampirism:dark_stone" }, "target": { "predicate_type": "minecraft:tag_match", diff --git a/src/generated/resources/data/vampirism/worldgen/placed_feature/ore_dark_stone_lower.json b/src/generated/resources/data/vampirism/worldgen/placed_feature/ore_dark_stone_lower.json index 4b2503aea7..c771bd3dc2 100644 --- a/src/generated/resources/data/vampirism/worldgen/placed_feature/ore_dark_stone_lower.json +++ b/src/generated/resources/data/vampirism/worldgen/placed_feature/ore_dark_stone_lower.json @@ -3,7 +3,7 @@ "placement": [ { "type": "minecraft:count", - "count": 2 + "count": 30 }, { "type": "minecraft:in_square" @@ -13,10 +13,10 @@ "height": { "type": "minecraft:uniform", "max_inclusive": { - "absolute": 60 + "below_top": 0 }, "min_inclusive": { - "absolute": 0 + "above_bottom": 0 } } }, diff --git a/src/generated/resources/data/vampirism/worldgen/placed_feature/ore_dark_stone_upper.json b/src/generated/resources/data/vampirism/worldgen/placed_feature/ore_dark_stone_upper.json deleted file mode 100644 index e845c2a33e..0000000000 --- a/src/generated/resources/data/vampirism/worldgen/placed_feature/ore_dark_stone_upper.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "feature": "vampirism:ore_dark_stone", - "placement": [ - { - "type": "minecraft:rarity_filter", - "chance": 6 - }, - { - "type": "minecraft:in_square" - }, - { - "type": "minecraft:height_range", - "height": { - "type": "minecraft:uniform", - "max_inclusive": { - "absolute": 128 - }, - "min_inclusive": { - "absolute": 64 - } - } - }, - { - "type": "minecraft:biome" - } - ] -} \ No newline at end of file diff --git a/src/main/java/de/teamlapen/vampirism/blocks/CastleBricksBlock.java b/src/main/java/de/teamlapen/vampirism/blocks/CastleBricksBlock.java deleted file mode 100644 index b63280ea2b..0000000000 --- a/src/main/java/de/teamlapen/vampirism/blocks/CastleBricksBlock.java +++ /dev/null @@ -1,76 +0,0 @@ -package de.teamlapen.vampirism.blocks; - -import de.teamlapen.vampirism.core.ModSounds; -import net.minecraft.ChatFormatting; -import net.minecraft.core.BlockPos; -import net.minecraft.network.chat.Component; -import net.minecraft.sounds.SoundSource; -import net.minecraft.util.RandomSource; -import net.minecraft.util.StringRepresentable; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.TooltipFlag; -import net.minecraft.world.level.BlockGetter; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.material.MapColor; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.List; - -public class CastleBricksBlock extends VampirismBlock { - private final EnumVariant variant; - - public CastleBricksBlock(EnumVariant variant) { - super(Properties.of().mapColor(MapColor.STONE).strength(2, 10).sound(SoundType.STONE)); - this.variant = variant; - - } - - @Override - public void animateTick(@NotNull BlockState state, @NotNull Level world, @NotNull BlockPos pos, @NotNull RandomSource rand) { - if (!CastleStairsBlock.isStairs(state) && variant == EnumVariant.DARK_BRICK_BLOODY) { - if (rand.nextInt(180) == 0) { - world.playLocalSound(pos.getX(), pos.getY(), pos.getZ(), ModSounds.AMBIENT_BLOOD_DRIPPING.get(), SoundSource.AMBIENT, 0.8F, 1.0F, false); - } - - } - } - - @Override - public void appendHoverText(@NotNull ItemStack stack, @Nullable BlockGetter world, @NotNull List tooltip, @NotNull TooltipFlag advanced) { - super.appendHoverText(stack, world, tooltip, advanced); - tooltip.add(Component.translatable("block.vampirism.castle_block" + (variant == EnumVariant.DARK_STONE ? ".no_spawn" : ".vampire_spawn")).withStyle(ChatFormatting.ITALIC, ChatFormatting.GRAY)); - } - - public EnumVariant getVariant() { - return variant; - } - - - public enum EnumVariant implements StringRepresentable { - DARK_BRICK("dark_brick"), - PURPLE_BRICK("purple_brick"), - DARK_BRICK_BLOODY("dark_brick_bloody"), - NORMAL_BRICK("normal_brick"), - DARK_STONE("dark_stone"), - CRACKED_DARK_BRICK("cracked_dark_brick"); - - private final String name; - - EnumVariant(String name) { - this.name = name; - } - - public @NotNull String getName() { - return this.getSerializedName(); - } - - @NotNull - @Override - public String getSerializedName() { - return this.name; - } - } -} diff --git a/src/main/java/de/teamlapen/vampirism/blocks/DarkStoneBlock.java b/src/main/java/de/teamlapen/vampirism/blocks/DarkStoneBlock.java new file mode 100644 index 0000000000..5d1fa74ac5 --- /dev/null +++ b/src/main/java/de/teamlapen/vampirism/blocks/DarkStoneBlock.java @@ -0,0 +1,46 @@ +package de.teamlapen.vampirism.blocks; + +import de.teamlapen.vampirism.core.ModBlocks; +import de.teamlapen.vampirism.core.ModSounds; +import de.teamlapen.vampirism.core.ModTags; +import net.minecraft.ChatFormatting; +import net.minecraft.core.BlockPos; +import net.minecraft.network.chat.Component; +import net.minecraft.sounds.SoundSource; +import net.minecraft.util.RandomSource; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.state.BlockState; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.List; + +public class DarkStoneBlock extends VampirismBlock { + + public DarkStoneBlock(Properties properties) { + super(properties); + + } + + @Override + public void animateTick(@NotNull BlockState state, @NotNull Level world, @NotNull BlockPos pos, @NotNull RandomSource rand) { + if (state.is(ModBlocks.BLOODY_DARK_STONE_BRICKS.get())) { + if (rand.nextInt(180) == 0) { + world.playLocalSound(pos.getX(), pos.getY(), pos.getZ(), ModSounds.AMBIENT_BLOOD_DRIPPING.get(), SoundSource.AMBIENT, 0.8F, 1.0F, false); + } + } + } + + @Override + public void appendHoverText(@NotNull ItemStack stack, @Nullable BlockGetter world, @NotNull List tooltip, @NotNull TooltipFlag advanced) { + super.appendHoverText(stack, world, tooltip, advanced); + if (stack.is(ModTags.Items.NO_SPAWN)) { + tooltip.add(Component.translatable("block.vampirism.castle_block.no_spawn").withStyle(ChatFormatting.ITALIC, ChatFormatting.GRAY)); + } else if (stack.is(ModTags.Items.VAMPIRE_SPAWN)) { + tooltip.add(Component.translatable("block.vampirism.castle_block.vampire_spawn").withStyle(ChatFormatting.ITALIC, ChatFormatting.GRAY)); + } + } +} diff --git a/src/main/java/de/teamlapen/vampirism/blocks/CastleSlabBlock.java b/src/main/java/de/teamlapen/vampirism/blocks/DarkStoneSlabBlock.java similarity index 52% rename from src/main/java/de/teamlapen/vampirism/blocks/CastleSlabBlock.java rename to src/main/java/de/teamlapen/vampirism/blocks/DarkStoneSlabBlock.java index 3dd109aa6d..824ac23425 100644 --- a/src/main/java/de/teamlapen/vampirism/blocks/CastleSlabBlock.java +++ b/src/main/java/de/teamlapen/vampirism/blocks/DarkStoneSlabBlock.java @@ -1,13 +1,12 @@ package de.teamlapen.vampirism.blocks; +import de.teamlapen.vampirism.core.ModTags; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.block.SlabBlock; -import net.minecraft.world.level.block.SoundType; -import net.minecraft.world.level.material.MapColor; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import org.jetbrains.annotations.NotNull; @@ -15,23 +14,20 @@ import java.util.List; -public class CastleSlabBlock extends SlabBlock { - private final CastleBricksBlock.EnumVariant variant; +public class DarkStoneSlabBlock extends SlabBlock { - public CastleSlabBlock(CastleBricksBlock.EnumVariant variant) { - super(Properties.of().mapColor(MapColor.STONE).strength(2, 10).sound(SoundType.STONE)); - this.variant = variant; + public DarkStoneSlabBlock(Properties properties) { + super(properties); } @OnlyIn(Dist.CLIENT) @Override public void appendHoverText(@NotNull ItemStack stack, @Nullable BlockGetter player, @NotNull List tooltip, @NotNull TooltipFlag advanced) { super.appendHoverText(stack, player, tooltip, advanced); - tooltip.add(Component.translatable("block.vampirism.castle_block" + (variant == CastleBricksBlock.EnumVariant.DARK_STONE ? ".no_spawn" : ".vampire_spawn")).withStyle(ChatFormatting.ITALIC, ChatFormatting.GRAY)); - - } - - public CastleBricksBlock.EnumVariant getVariant() { - return variant; + if (stack.is(ModTags.Items.NO_SPAWN)) { + tooltip.add(Component.translatable("block.vampirism.castle_block.no_spawn").withStyle(ChatFormatting.ITALIC, ChatFormatting.GRAY)); + } else if (stack.is(ModTags.Items.VAMPIRE_SPAWN)) { + tooltip.add(Component.translatable("block.vampirism.castle_block.vampire_spawn").withStyle(ChatFormatting.ITALIC, ChatFormatting.GRAY)); + } } } diff --git a/src/main/java/de/teamlapen/vampirism/blocks/CastleStairsBlock.java b/src/main/java/de/teamlapen/vampirism/blocks/DarkStoneStairsBlock.java similarity index 53% rename from src/main/java/de/teamlapen/vampirism/blocks/CastleStairsBlock.java rename to src/main/java/de/teamlapen/vampirism/blocks/DarkStoneStairsBlock.java index e8066da0af..ac13e5bdf4 100644 --- a/src/main/java/de/teamlapen/vampirism/blocks/CastleStairsBlock.java +++ b/src/main/java/de/teamlapen/vampirism/blocks/DarkStoneStairsBlock.java @@ -1,14 +1,13 @@ package de.teamlapen.vampirism.blocks; +import de.teamlapen.vampirism.core.ModTags; import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.TooltipFlag; import net.minecraft.world.level.BlockGetter; -import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.StairBlock; import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.material.MapColor; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import org.jetbrains.annotations.NotNull; @@ -17,23 +16,20 @@ import java.util.List; import java.util.function.Supplier; -public class CastleStairsBlock extends StairBlock { - private final CastleBricksBlock.EnumVariant variant; +public class DarkStoneStairsBlock extends StairBlock { - public CastleStairsBlock(@NotNull Supplier state, CastleBricksBlock.EnumVariant variant) { - super(state, Properties.of().mapColor(MapColor.STONE).strength(2, 10).sound(SoundType.STONE)); - this.variant = variant; + public DarkStoneStairsBlock(@NotNull Supplier state, Properties properties) { + super(state, properties); } @OnlyIn(Dist.CLIENT) @Override public void appendHoverText(@NotNull ItemStack stack, @Nullable BlockGetter player, @NotNull List tooltip, @NotNull TooltipFlag advanced) { super.appendHoverText(stack, player, tooltip, advanced); - tooltip.add(Component.translatable("block.vampirism.castle_block" + (variant == CastleBricksBlock.EnumVariant.DARK_STONE ? ".no_spawn" : ".vampire_spawn")).withStyle(ChatFormatting.ITALIC, ChatFormatting.GRAY)); - - } - - public CastleBricksBlock.EnumVariant getVariant() { - return variant; + if (stack.is(ModTags.Items.NO_SPAWN)) { + tooltip.add(Component.translatable("block.vampirism.castle_block.no_spawn").withStyle(ChatFormatting.ITALIC, ChatFormatting.GRAY)); + } else if (stack.is(ModTags.Items.VAMPIRE_SPAWN)) { + tooltip.add(Component.translatable("block.vampirism.castle_block.vampire_spawn").withStyle(ChatFormatting.ITALIC, ChatFormatting.GRAY)); + } } } diff --git a/src/main/java/de/teamlapen/vampirism/core/ModBlocks.java b/src/main/java/de/teamlapen/vampirism/core/ModBlocks.java index b2a2d0e4a3..ad4a472336 100755 --- a/src/main/java/de/teamlapen/vampirism/core/ModBlocks.java +++ b/src/main/java/de/teamlapen/vampirism/core/ModBlocks.java @@ -47,17 +47,9 @@ public class ModBlocks { public static final RegistryObject BLOOD_GRINDER = registerWithItem("blood_grinder", GrinderBlock::new); public static final RegistryObject BLOOD_PEDESTAL = registerWithItem("blood_pedestal", PedestalBlock::new); public static final RegistryObject BLOOD_SIEVE = registerWithItem("blood_sieve", SieveBlock::new); - public static final RegistryObject CASTLE_BLOCK_DARK_BRICK = registerWithItem("castle_block_dark_brick", () -> new CastleBricksBlock(CastleBricksBlock.EnumVariant.DARK_BRICK)); - public static final RegistryObject CASTLE_BLOCK_DARK_BRICK_BLOODY = registerWithItem("castle_block_dark_brick_bloody", () -> new CastleBricksBlock(CastleBricksBlock.EnumVariant.DARK_BRICK_BLOODY)); - public static final RegistryObject CASTLE_BLOCK_DARK_STONE = registerWithItem("castle_block_dark_stone", () -> new CastleBricksBlock(CastleBricksBlock.EnumVariant.DARK_STONE)); - public static final RegistryObject CASTLE_BLOCK_NORMAL_BRICK = registerWithItem("castle_block_normal_brick", () -> new CastleBricksBlock(CastleBricksBlock.EnumVariant.NORMAL_BRICK)); - public static final RegistryObject CASTLE_BLOCK_PURPLE_BRICK = registerWithItem("castle_block_purple_brick", () -> new CastleBricksBlock(CastleBricksBlock.EnumVariant.PURPLE_BRICK)); - public static final RegistryObject CASTLE_SLAB_DARK_BRICK = registerWithItem("castle_slab_dark_brick", () -> new CastleSlabBlock(CastleBricksBlock.EnumVariant.DARK_BRICK)); - public static final RegistryObject CASTLE_SLAB_DARK_STONE = registerWithItem("castle_slab_dark_stone", () -> new CastleSlabBlock(CastleBricksBlock.EnumVariant.DARK_STONE)); - public static final RegistryObject CASTLE_SLAB_PURPLE_BRICK = registerWithItem("castle_slab_purple_brick", () -> new CastleSlabBlock(CastleBricksBlock.EnumVariant.PURPLE_BRICK)); - public static final RegistryObject CASTLE_STAIRS_DARK_BRICK = registerWithItem("castle_stairs_dark_brick", () -> new CastleStairsBlock(() -> CASTLE_BLOCK_DARK_BRICK.get().defaultBlockState(), CastleBricksBlock.EnumVariant.DARK_BRICK)); - public static final RegistryObject CASTLE_STAIRS_DARK_STONE = registerWithItem("castle_stairs_dark_stone", () -> new CastleStairsBlock(() -> CASTLE_BLOCK_DARK_STONE.get().defaultBlockState(), CastleBricksBlock.EnumVariant.DARK_STONE)); - public static final RegistryObject CASTLE_STAIRS_PURPLE_BRICK = registerWithItem("castle_stairs_purple_brick", () -> new CastleStairsBlock(() -> CASTLE_BLOCK_PURPLE_BRICK.get().defaultBlockState(), CastleBricksBlock.EnumVariant.PURPLE_BRICK)); + public static final RegistryObject CASTLE_BLOCK_PURPLE_BRICK = registerWithItem("castle_block_purple_brick", () -> new DarkStoneBlock(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).requiresCorrectToolForDrops().strength(2f, 10f).sound(SoundType.STONE))); + public static final RegistryObject CASTLE_SLAB_PURPLE_BRICK = registerWithItem("castle_slab_purple_brick", () -> new DarkStoneSlabBlock(BlockBehaviour.Properties.copy(CASTLE_BLOCK_PURPLE_BRICK.get()))); + public static final RegistryObject CASTLE_STAIRS_PURPLE_BRICK = registerWithItem("castle_stairs_purple_brick", () -> new DarkStoneStairsBlock(CASTLE_BLOCK_PURPLE_BRICK.map(Block::defaultBlockState)::get, BlockBehaviour.Properties.copy(CASTLE_BLOCK_PURPLE_BRICK.get()))); public static final RegistryObject ALTAR_CLEANSING = registerWithItem("altar_cleansing", AltarCleansingBlock::new); public static final RegistryObject CURSED_EARTH = registerWithItem("cursed_earth", CursedEarthBlock::new); public static final RegistryObject FIRE_PLACE = registerWithItem("fire_place", FirePlaceBlock::new); @@ -153,9 +145,32 @@ public class ModBlocks { public static final RegistryObject DARK_SPRUCE_WALL_HANGING_SIGN = BLOCKS.register("dark_spruce_wall_hanging_sign", () -> new WallHangingSignBlock(BlockBehaviour.Properties.of().mapColor(DARK_SPRUCE_LOG.get().defaultMapColor()).ignitedByLava().noCollission().strength(1.0F).sound(SoundType.WOOD).lootFrom(DARK_SPRUCE_HANGING_SIGN), LogBlock.DARK_SPRUCE)); public static final RegistryObject CURSED_SPRUCE_WALL_HANGING_SIGN = BLOCKS.register("cursed_spruce_wall_hanging_sign", () -> new WallHangingSignBlock(BlockBehaviour.Properties.of().mapColor(CURSED_SPRUCE_LOG.get().defaultMapColor()).ignitedByLava().noCollission().strength(1.0F).sound(SoundType.WOOD).lootFrom(CURSED_SPRUCE_HANGING_SIGN), LogBlock.CURSED_SPRUCE)); public static final RegistryObject CURSED_EARTH_PATH = registerWithItem("cursed_earth_path", () -> new CursedEarthPathBlock(BlockBehaviour.Properties.of().mapColor(MapColor.DIRT).strength(0.65F).sound(SoundType.GRASS).isViewBlocking(UtilLib::always).isSuffocating(UtilLib::always))); - public static final RegistryObject CASTLE_BLOCK_DARK_BRICK_CRACKED = registerWithItem("castle_block_dark_brick_cracked", () -> new CastleBricksBlock(CastleBricksBlock.EnumVariant.CRACKED_DARK_BRICK)); - public static final RegistryObject CASTLE_BLOCK_DARK_BRICK_WALL = registerWithItem("castle_block_dark_brick_wall", () -> new WallBlock(BlockBehaviour.Properties.copy(ModBlocks.CASTLE_BLOCK_DARK_BRICK.get()).forceSolidOn())); public static final RegistryObject CASTLE_BLOCK_PURPLE_BRICK_WALL = registerWithItem("castle_block_purple_brick_wall", () -> new WallBlock(BlockBehaviour.Properties.copy(ModBlocks.CASTLE_BLOCK_PURPLE_BRICK.get()).forceSolidOn())); + public static final RegistryObject DARK_STONE = registerWithItem("dark_stone", () -> new DarkStoneBlock(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).requiresCorrectToolForDrops().strength(2f, 10f).sound(SoundType.STONE))); + public static final RegistryObject DARK_STONE_STAIRS = registerWithItem("dark_stone_stairs", () -> new DarkStoneStairsBlock(DARK_STONE.map(Block::defaultBlockState)::get, BlockBehaviour.Properties.copy(DARK_STONE.get()))); + public static final RegistryObject DARK_STONE_SLAB = registerWithItem("dark_stone_slab", () -> new DarkStoneSlabBlock(BlockBehaviour.Properties.copy(DARK_STONE.get()))); + public static final RegistryObject DARK_STONE_WALL = registerWithItem("dark_stone_wall", () -> new WallBlock(BlockBehaviour.Properties.copy(DARK_STONE.get()).forceSolidOn())); + public static final RegistryObject DARK_STONE_BRICKS = registerWithItem("dark_stone_bricks", () -> new DarkStoneBlock(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).requiresCorrectToolForDrops().strength(2f, 10f).sound(SoundType.STONE))); + public static final RegistryObject DARK_STONE_BRICK_STAIRS = registerWithItem("dark_stone_brick_stairs", () -> new DarkStoneStairsBlock(DARK_STONE_BRICKS.map(Block::defaultBlockState)::get, BlockBehaviour.Properties.copy(DARK_STONE_BRICKS.get()))); + public static final RegistryObject DARK_STONE_BRICK_SLAB = registerWithItem("dark_stone_brick_slab", () -> new DarkStoneSlabBlock(BlockBehaviour.Properties.copy(DARK_STONE_BRICKS.get()))); + public static final RegistryObject DARK_STONE_BRICK_WALL = registerWithItem("dark_stone_brick_wall", () -> new WallBlock(BlockBehaviour.Properties.copy(DARK_STONE_BRICKS.get()).forceSolidOn())); + public static final RegistryObject CRACKED_DARK_STONE_BRICKS = registerWithItem("cracked_dark_stone_bricks", () -> new DarkStoneBlock(BlockBehaviour.Properties.copy(DARK_STONE_BRICKS.get()))); + public static final RegistryObject COBBLED_DARK_STONE = registerWithItem("cobbled_dark_stone", () -> new DarkStoneBlock(BlockBehaviour.Properties.of().mapColor(MapColor.STONE).strength(2.5f, 10f).requiresCorrectToolForDrops().sound(SoundType.STONE))); + public static final RegistryObject COBBLED_DARK_STONE_STAIRS = registerWithItem("cobbled_dark_stone_stairs", () -> new DarkStoneStairsBlock(ModBlocks.COBBLED_DARK_STONE.map(Block::defaultBlockState)::get, BlockBehaviour.Properties.copy(COBBLED_DARK_STONE.get()))); + public static final RegistryObject COBBLED_DARK_STONE_SLAB = registerWithItem("cobbled_dark_stone_slab", () -> new DarkStoneSlabBlock(BlockBehaviour.Properties.copy(COBBLED_DARK_STONE.get()))); + public static final RegistryObject COBBLED_DARK_STONE_WALL = registerWithItem("cobbled_dark_stone_wall", () -> new WallBlock(BlockBehaviour.Properties.copy(COBBLED_DARK_STONE.get()).forceSolidOn())); + public static final RegistryObject POLISHED_DARK_STONE = registerWithItem("polished_dark_stone", () -> new DarkStoneBlock(BlockBehaviour.Properties.copy(COBBLED_DARK_STONE.get()))); + public static final RegistryObject POLISHED_DARK_STONE_STAIRS = registerWithItem("polished_dark_stone_stairs", () -> new DarkStoneStairsBlock(POLISHED_DARK_STONE.map(Block::defaultBlockState)::get, BlockBehaviour.Properties.copy(POLISHED_DARK_STONE.get()))); + public static final RegistryObject POLISHED_DARK_STONE_SLAB = registerWithItem("polished_dark_stone_slab", () -> new DarkStoneSlabBlock(BlockBehaviour.Properties.copy(POLISHED_DARK_STONE.get()))); + public static final RegistryObject POLISHED_DARK_STONE_WALL = registerWithItem("polished_dark_stone_wall", () -> new WallBlock(BlockBehaviour.Properties.copy(POLISHED_DARK_STONE.get()).forceSolidOn())); + public static final RegistryObject DARK_STONE_TILES = registerWithItem("dark_stone_tiles", () -> new DarkStoneBlock(BlockBehaviour.Properties.copy(COBBLED_DARK_STONE.get()))); + public static final RegistryObject CRACKED_DARK_STONE_TILES = registerWithItem("cracked_dark_stone_tiles", () -> new DarkStoneBlock(BlockBehaviour.Properties.copy(DARK_STONE_TILES.get()))); + public static final RegistryObject DARK_STONE_TILES_STAIRS = registerWithItem("dark_stone_tiles_stairs", () -> new DarkStoneStairsBlock(ModBlocks.DARK_STONE_TILES.map(Block::defaultBlockState)::get, BlockBehaviour.Properties.copy(DARK_STONE_TILES.get()))); + public static final RegistryObject DARK_STONE_TILES_SLAB = registerWithItem("dark_stone_tiles_slab", () -> new DarkStoneSlabBlock(BlockBehaviour.Properties.copy(DARK_STONE_TILES.get()))); + public static final RegistryObject DARK_STONE_TILES_WALL = registerWithItem("dark_stone_tiles_wall", () -> new WallBlock(BlockBehaviour.Properties.copy(DARK_STONE_TILES.get()).forceSolidOn())); + public static final RegistryObject CHISELED_DARK_STONE_BRICKS = registerWithItem("chiseled_dark_stone_bricks", () -> new DarkStoneBlock(BlockBehaviour.Properties.copy(DARK_STONE_BRICKS.get()))); + public static final RegistryObject INFESTED_DARK_STONE = registerWithItem("infested_dark_stone", () -> new DarkStoneBlock(BlockBehaviour.Properties.copy(DARK_STONE.get()))); + public static final RegistryObject BLOODY_DARK_STONE_BRICKS = registerWithItem("bloody_dark_stone_bricks", () -> new DarkStoneBlock(BlockBehaviour.Properties.copy(DARK_STONE_BRICKS.get()))); /** * TUTORIAL: @@ -198,6 +213,16 @@ public static void fixMappings(@NotNull MissingMappingsEvent event) { case "vampirism:bloody_spruce_log" -> missingMapping.remap(ModBlocks.CURSED_SPRUCE_LOG.get()); case "vampirism:cursed_grass_block" -> missingMapping.remap(ModBlocks.CURSED_GRASS.get()); case "cursed_bark" -> missingMapping.ignore(); + case "castle_block_dark_brick" -> missingMapping.remap(ModBlocks.DARK_STONE_BRICKS.get()); + case "castle_block_dark_brick_bloody" -> missingMapping.remap(ModBlocks.BLOODY_DARK_STONE_BRICKS.get()); + case "castle_block_dark_stone" -> missingMapping.remap(ModBlocks.DARK_STONE.get()); + case "castle_block_normal_brick" -> missingMapping.remap(Blocks.STONE_BRICKS); + case "castle_slab_dark_brick" -> missingMapping.remap(ModBlocks.DARK_STONE_BRICK_SLAB.get()); + case "castle_slab_dark_stone" -> missingMapping.remap(ModBlocks.DARK_STONE_SLAB.get()); + case "castle_stairs_dark_brick" -> missingMapping.remap(ModBlocks.DARK_STONE_BRICK_STAIRS.get()); + case "castle_stairs_dark_stone" -> missingMapping.remap(ModBlocks.DARK_STONE_STAIRS.get()); + case "castle_block_dark_brick_cracked" -> missingMapping.remap(ModBlocks.CRACKED_DARK_STONE_BRICKS.get()); + case "castle_block_dark_brick_wall" -> missingMapping.remap(ModBlocks.DARK_STONE_BRICK_WALL.get()); } }); } diff --git a/src/main/java/de/teamlapen/vampirism/core/ModTags.java b/src/main/java/de/teamlapen/vampirism/core/ModTags.java index 400e505202..f47e80798b 100644 --- a/src/main/java/de/teamlapen/vampirism/core/ModTags.java +++ b/src/main/java/de/teamlapen/vampirism/core/ModTags.java @@ -29,9 +29,12 @@ public class ModTags { } public static class Blocks { + @Deprecated public static final TagKey CASTLE_BLOCK = tag("castle_block"); public static final TagKey CURSED_EARTH = tag("cursed_earth"); + @Deprecated public static final TagKey CASTLE_STAIRS = tag("castle_stairs"); + @Deprecated public static final TagKey CASTLE_SLAPS = tag("castle_slaps"); public static final TagKey DARK_SPRUCE_LOG = tag("dark_spruce_log"); public static final TagKey CURSED_SPRUCE_LOG = tag("cursed_spruce_log"); @@ -39,6 +42,13 @@ public static class Blocks { public static final TagKey TOTEM_TOP_FRAGILE = tag("totem_top_fragile"); public static final TagKey TOTEM_TOP = tag("totem_top"); public static final TagKey COFFIN = tag("coffin"); + public static final TagKey DARK_STONE = tag("dark_stone"); + public static final TagKey DARK_STONE_BRICKS = tag("dark_stone_bricks"); + public static final TagKey POLISHED_DARK_STONE = tag("polished_dark_brick"); + public static final TagKey COBBLED_DARK_STONE = tag("cobbled_dark_brick"); + public static final TagKey DARK_STONE_TILES = tag("dark_brick_tiles"); + public static final TagKey NO_SPAWN = tag("no_spawn"); + public static final TagKey VAMPIRE_SPAWN = tag("vampire_spawn"); private static @NotNull TagKey tag(@NotNull ResourceLocation resourceLocation) { return BlockTags.create(resourceLocation); @@ -68,6 +78,13 @@ public static class Items { public static final TagKey APPLICABLE_OIL_PICKAXE = tag("applicable_oil/pickaxe"); public static final TagKey APPLICABLE_OIL_ARMOR = tag("applicable_oil/armor"); public static final TagKey HUNTER_COAT = tag("armo/hunter_coat"); + public static final TagKey DARK_STONE = tag("dark_stone"); + public static final TagKey DARK_STONE_BRICKS = tag("dark_stone_bricks"); + public static final TagKey POLISHED_DARK_STONE = tag("polished_dark_brick"); + public static final TagKey COBBLED_DARK_STONE = tag("cobbled_dark_brick"); + public static final TagKey DARK_STONE_TILES = tag("dark_brick_tiles"); + public static final TagKey NO_SPAWN = tag("no_spawn"); + public static final TagKey VAMPIRE_SPAWN = tag("vampire_spawn"); private static @NotNull TagKey tag(@NotNull ResourceLocation resourceLocation) { return ItemTags.create(resourceLocation); diff --git a/src/main/java/de/teamlapen/vampirism/data/BlockStateGenerator.java b/src/main/java/de/teamlapen/vampirism/data/BlockStateGenerator.java index fedb0977b1..f00ec08e1f 100644 --- a/src/main/java/de/teamlapen/vampirism/data/BlockStateGenerator.java +++ b/src/main/java/de/teamlapen/vampirism/data/BlockStateGenerator.java @@ -30,6 +30,10 @@ public BlockStateGenerator(@NotNull PackOutput packOutput, @NotNull ExistingFile @Override protected void registerStatesAndModels() { + createDarkStone(); + createWoodStates(); + createCursedBark(); + ResourceLocation cutout = new ResourceLocation("cutout"); ResourceLocation cutout_mipped = new ResourceLocation("cutout_mipped"); ResourceLocation translucent = new ResourceLocation("translucent"); @@ -44,11 +48,6 @@ protected void registerStatesAndModels() { horizontalBlock(ModBlocks.ALTAR_CLEANSING.get(), models().getExistingFile(modLoc("block/altar_cleansing"))); horizontalBlock(ModBlocks.BLOOD_GRINDER.get(), models().getExistingFile(modLoc("block/blood_grinder"))); - simpleBlock(ModBlocks.CASTLE_BLOCK_DARK_BRICK.get()); - simpleBlock(ModBlocks.CASTLE_BLOCK_DARK_BRICK_BLOODY.get()); - simpleBlock(ModBlocks.CASTLE_BLOCK_DARK_STONE.get()); - simpleBlock(ModBlocks.CASTLE_BLOCK_NORMAL_BRICK.get()); - simpleBlock(ModBlocks.CASTLE_BLOCK_PURPLE_BRICK.get()); simpleBlock(ModBlocks.CURSED_EARTH.get()); simpleBlock(ModBlocks.SUNSCREEN_BEACON.get(), models().withExistingParent("vampirism:block/sunscreen_beacon", "minecraft:block/beacon").texture("beacon", "vampirism:block/cursed_earth").renderType(cutout)); BlockModelBuilder builder1 = models().getBuilder("vampirism:block/empty").texture("particle", "minecraft:block/spruce_planks"); @@ -74,15 +73,6 @@ protected void registerStatesAndModels() { simpleBlock(ModBlocks.CURSED_SPRUCE_SAPLING.get(), cursed_spruce_sapling); - stairsBlock(ModBlocks.CASTLE_STAIRS_DARK_STONE.get(), modLoc("block/castle_block_dark_stone")); - stairsBlock(ModBlocks.CASTLE_STAIRS_DARK_BRICK.get(), modLoc("block/castle_block_dark_brick")); - stairsBlock(ModBlocks.CASTLE_STAIRS_PURPLE_BRICK.get(), modLoc("block/castle_block_purple_brick")); - - slabBlock(ModBlocks.CASTLE_SLAB_DARK_BRICK.get(), modLoc("block/castle_block_dark_brick"), modLoc("block/castle_block_dark_brick")); - slabBlock(ModBlocks.CASTLE_SLAB_DARK_STONE.get(), modLoc("block/castle_block_dark_stone"), modLoc("block/castle_block_dark_stone")); - slabBlock(ModBlocks.CASTLE_SLAB_PURPLE_BRICK.get(), modLoc("block/castle_block_purple_brick"), modLoc("block/castle_block_purple_brick")); - - //variants getVariantBuilder(ModBlocks.GARLIC.get()) @@ -249,9 +239,6 @@ protected void registerStatesAndModels() { doorBlock(ModBlocks.DARK_SPRUCE_DOOR.get(), new ResourceLocation(REFERENCE.MODID, "block/dark_spruce_door_bottom"), new ResourceLocation(REFERENCE.MODID, "block/dark_spruce_door_top")); doorBlock(ModBlocks.CURSED_SPRUCE_DOOR.get(), new ResourceLocation(REFERENCE.MODID, "block/cursed_spruce_door_bottom"), new ResourceLocation(REFERENCE.MODID, "block/cursed_spruce_door_top")); - createWoodStates(); - createCursedBark(); - horizontalBlock(ModBlocks.VAMPIRE_RACK.get(), models().getExistingFile(modLoc("block/vampire_rack"))); horizontalBlock(ModBlocks.THRONE.get(), models().getExistingFile(modLoc("block/throne"))); @@ -286,10 +273,6 @@ protected void registerStatesAndModels() { .end() .renderType(cutout); simpleBlock(ModBlocks.CURSED_EARTH_PATH.get(), cursedEarthPath); - simpleBlock(ModBlocks.CASTLE_BLOCK_DARK_BRICK_CRACKED.get()); - - wallBlock(ModBlocks.CASTLE_BLOCK_DARK_BRICK_WALL.get(), blockTexture(ModBlocks.CASTLE_BLOCK_DARK_BRICK.get())); - wallBlock(ModBlocks.CASTLE_BLOCK_PURPLE_BRICK_WALL.get(), blockTexture(ModBlocks.CASTLE_BLOCK_PURPLE_BRICK.get())); } private void createWoodStates() { @@ -357,6 +340,39 @@ private void createCursedBark() { simpleBlock(ModBlocks.DIAGONAL_CURSED_BARK.get(), models().getBuilder("vampirism:cursed_bark_empty")); } + private void createDarkStone() { + simpleBlock(ModBlocks.DARK_STONE_BRICKS.get()); + stairsBlock(ModBlocks.DARK_STONE_BRICK_STAIRS.get(), modLoc("block/dark_stone_bricks")); + slabBlock(ModBlocks.DARK_STONE_BRICK_SLAB.get(), modLoc("block/dark_stone_bricks"), modLoc("block/dark_stone_bricks")); + wallBlock(ModBlocks.DARK_STONE_BRICK_WALL.get(), modLoc("block/dark_stone_bricks")); + simpleBlock(ModBlocks.DARK_STONE.get()); + simpleBlock(ModBlocks.INFESTED_DARK_STONE.get(), models().getExistingFile(modLoc("block/dark_stone"))); + stairsBlock(ModBlocks.DARK_STONE_STAIRS.get(), modLoc("block/dark_stone")); + slabBlock(ModBlocks.DARK_STONE_SLAB.get(), modLoc("block/dark_stone"), modLoc("block/dark_stone")); + wallBlock(ModBlocks.DARK_STONE_WALL.get(), modLoc("block/dark_stone")); + simpleBlock(ModBlocks.COBBLED_DARK_STONE.get()); + stairsBlock(ModBlocks.COBBLED_DARK_STONE_STAIRS.get(), modLoc("block/cobbled_dark_stone")); + slabBlock(ModBlocks.COBBLED_DARK_STONE_SLAB.get(), modLoc("block/cobbled_dark_stone"), modLoc("block/cobbled_dark_stone")); + wallBlock(ModBlocks.COBBLED_DARK_STONE_WALL.get(), modLoc("block/cobbled_dark_stone")); + simpleBlock(ModBlocks.POLISHED_DARK_STONE.get()); + stairsBlock(ModBlocks.POLISHED_DARK_STONE_STAIRS.get(), modLoc("block/polished_dark_stone")); + slabBlock(ModBlocks.POLISHED_DARK_STONE_SLAB.get(), modLoc("block/polished_dark_stone"), modLoc("block/polished_dark_stone")); + wallBlock(ModBlocks.POLISHED_DARK_STONE_WALL.get(), modLoc("block/polished_dark_stone")); + simpleBlock(ModBlocks.DARK_STONE_TILES.get()); + simpleBlock(ModBlocks.CRACKED_DARK_STONE_TILES.get()); + stairsBlock(ModBlocks.DARK_STONE_TILES_STAIRS.get(), modLoc("block/dark_stone_tiles")); + slabBlock(ModBlocks.DARK_STONE_TILES_SLAB.get(), modLoc("block/dark_stone_tiles"), modLoc("block/dark_stone_tiles")); + wallBlock(ModBlocks.DARK_STONE_TILES_WALL.get(), modLoc("block/dark_stone_tiles")); + simpleBlock(ModBlocks.CHISELED_DARK_STONE_BRICKS.get()); + + simpleBlock(ModBlocks.BLOODY_DARK_STONE_BRICKS.get()); + simpleBlock(ModBlocks.CRACKED_DARK_STONE_BRICKS.get()); + simpleBlock(ModBlocks.CASTLE_BLOCK_PURPLE_BRICK.get()); + stairsBlock(ModBlocks.CASTLE_STAIRS_PURPLE_BRICK.get(), modLoc("block/castle_block_purple_brick")); + wallBlock(ModBlocks.CASTLE_BLOCK_PURPLE_BRICK_WALL.get(), blockTexture(ModBlocks.CASTLE_BLOCK_PURPLE_BRICK.get())); + slabBlock(ModBlocks.CASTLE_SLAB_PURPLE_BRICK.get(), modLoc("block/castle_block_purple_brick"), modLoc("block/castle_block_purple_brick")); + } + private void button(Block block, @NotNull ResourceLocation texture) { ResourceLocation id = RegUtil.id(block); ModelFile button = models().withExistingParent("block/" + id.getPath(), new ResourceLocation("block/button")).texture("texture", texture.getPath()); diff --git a/src/main/java/de/teamlapen/vampirism/data/ItemModelGenerator.java b/src/main/java/de/teamlapen/vampirism/data/ItemModelGenerator.java index 1e856ad72e..5b619a3ffb 100644 --- a/src/main/java/de/teamlapen/vampirism/data/ItemModelGenerator.java +++ b/src/main/java/de/teamlapen/vampirism/data/ItemModelGenerator.java @@ -29,16 +29,9 @@ public ItemModelGenerator(@NotNull PackOutput packOutput, @NotNull ExistingFileH protected void registerModels() { Set blocks = new HashSet<>() {{ add(ModBlocks.ALTAR_TIP.get()); - add(ModBlocks.CASTLE_BLOCK_DARK_BRICK.get()); - add(ModBlocks.CASTLE_BLOCK_DARK_BRICK_BLOODY.get()); - add(ModBlocks.CASTLE_BLOCK_DARK_STONE.get()); - add(ModBlocks.CASTLE_BLOCK_NORMAL_BRICK.get()); + add(ModBlocks.BLOODY_DARK_STONE_BRICKS.get()); add(ModBlocks.CASTLE_BLOCK_PURPLE_BRICK.get()); - add(ModBlocks.CASTLE_SLAB_DARK_BRICK.get()); - add(ModBlocks.CASTLE_SLAB_DARK_STONE.get()); add(ModBlocks.CASTLE_SLAB_PURPLE_BRICK.get()); - add(ModBlocks.CASTLE_STAIRS_DARK_BRICK.get()); - add(ModBlocks.CASTLE_STAIRS_DARK_STONE.get()); add(ModBlocks.CASTLE_STAIRS_PURPLE_BRICK.get()); add(ModBlocks.BLOOD_GRINDER.get()); add(ModBlocks.BLOOD_PEDESTAL.get()); @@ -80,7 +73,29 @@ protected void registerModels() { add(ModBlocks.VAMPIRE_RACK.get()); add(ModBlocks.THRONE.get()); add(ModBlocks.CURSED_EARTH_PATH.get()); - add(ModBlocks.CASTLE_BLOCK_DARK_BRICK_CRACKED.get()); + add(ModBlocks.CRACKED_DARK_STONE_BRICKS.get()); + add(ModBlocks.DARK_STONE_BRICKS.get()); + add(ModBlocks.DARK_STONE_BRICK_WALL.get()); + add(ModBlocks.DARK_STONE_BRICK_SLAB.get()); + add(ModBlocks.DARK_STONE_BRICK_STAIRS.get()); + add(ModBlocks.CHISELED_DARK_STONE_BRICKS.get()); + add(ModBlocks.DARK_STONE.get()); + add(ModBlocks.DARK_STONE_STAIRS.get()); + add(ModBlocks.DARK_STONE_SLAB.get()); + add(ModBlocks.DARK_STONE_WALL.get()); + add(ModBlocks.DARK_STONE_TILES.get()); + add(ModBlocks.DARK_STONE_TILES_STAIRS.get()); + add(ModBlocks.DARK_STONE_TILES_SLAB.get()); + add(ModBlocks.DARK_STONE_TILES_WALL.get()); + add(ModBlocks.POLISHED_DARK_STONE.get()); + add(ModBlocks.POLISHED_DARK_STONE_STAIRS.get()); + add(ModBlocks.POLISHED_DARK_STONE_SLAB.get()); + add(ModBlocks.POLISHED_DARK_STONE_WALL.get()); + add(ModBlocks.COBBLED_DARK_STONE.get()); + add(ModBlocks.COBBLED_DARK_STONE_SLAB.get()); + add(ModBlocks.COBBLED_DARK_STONE_STAIRS.get()); + add(ModBlocks.COBBLED_DARK_STONE_WALL.get()); + add(ModBlocks.CRACKED_DARK_STONE_TILES.get()); }}; Set items = new HashSet<>() {{ add(ModItems.HUNTER_COAT_CHEST_NORMAL.get()); @@ -303,7 +318,12 @@ protected void registerModels() { this.item(ModItems.OIL_BOTTLE.get(), modLoc("item/oil_bottle"), modLoc("item/oil_bottle_overlay")); withExistingParent(ModBlocks.ALCHEMY_TABLE.get(), modLoc("block/alchemy_table/alchemy_table")); withExistingParent(ModBlocks.CASTLE_BLOCK_PURPLE_BRICK_WALL.get(), mcLoc("block/wall_inventory")).texture("wall", modLoc("block/castle_block_purple_brick")); - withExistingParent(ModBlocks.CASTLE_BLOCK_DARK_BRICK_WALL.get(), mcLoc("block/wall_inventory")).texture("wall", modLoc("block/castle_block_dark_brick")); + withExistingParent(ModBlocks.DARK_STONE_BRICK_WALL.get(), mcLoc("block/wall_inventory")).texture("wall", modLoc("block/dark_stone_bricks")); + withExistingParent(ModBlocks.DARK_STONE_WALL.get(), mcLoc("block/wall_inventory")).texture("wall", modLoc("block/dark_stone")); + withExistingParent(ModBlocks.DARK_STONE_TILES_WALL.get(), mcLoc("block/wall_inventory")).texture("wall", modLoc("block/dark_stone_tiles")); + withExistingParent(ModBlocks.COBBLED_DARK_STONE_WALL.get(), mcLoc("block/wall_inventory")).texture("wall", modLoc("block/cobbled_dark_stone")); + withExistingParent(ModBlocks.POLISHED_DARK_STONE_WALL.get(), mcLoc("block/wall_inventory")).texture("wall", modLoc("block/polished_dark_stone")); + withExistingParent(ModBlocks.INFESTED_DARK_STONE.get(), modLoc("block/dark_stone")); } } diff --git a/src/main/java/de/teamlapen/vampirism/data/LootTablesGenerator.java b/src/main/java/de/teamlapen/vampirism/data/LootTablesGenerator.java index 897652172f..f1fa9e0ff0 100644 --- a/src/main/java/de/teamlapen/vampirism/data/LootTablesGenerator.java +++ b/src/main/java/de/teamlapen/vampirism/data/LootTablesGenerator.java @@ -295,16 +295,15 @@ protected void generate() { this.dropSelf(ModBlocks.BLOOD_PEDESTAL.get()); this.dropSelf(ModBlocks.POTION_TABLE.get()); this.dropSelf(ModBlocks.BLOOD_SIEVE.get()); - this.dropSelf(ModBlocks.CASTLE_BLOCK_DARK_BRICK.get()); - this.dropSelf(ModBlocks.CASTLE_BLOCK_DARK_BRICK_BLOODY.get()); - this.dropSelf(ModBlocks.CASTLE_BLOCK_DARK_STONE.get()); - this.dropSelf(ModBlocks.CASTLE_BLOCK_NORMAL_BRICK.get()); + this.dropSelf(ModBlocks.DARK_STONE_BRICKS.get()); + this.dropSelf(ModBlocks.BLOODY_DARK_STONE_BRICKS.get()); + this.dropSelf(ModBlocks.DARK_STONE.get()); this.dropSelf(ModBlocks.CASTLE_BLOCK_PURPLE_BRICK.get()); - this.dropSelf(ModBlocks.CASTLE_SLAB_DARK_BRICK.get()); - this.dropSelf(ModBlocks.CASTLE_SLAB_DARK_STONE.get()); + this.dropSelf(ModBlocks.DARK_STONE_BRICK_SLAB.get()); + this.dropSelf(ModBlocks.DARK_STONE_SLAB.get()); this.dropSelf(ModBlocks.CASTLE_SLAB_PURPLE_BRICK.get()); - this.dropSelf(ModBlocks.CASTLE_STAIRS_DARK_BRICK.get()); - this.dropSelf(ModBlocks.CASTLE_STAIRS_DARK_STONE.get()); + this.dropSelf(ModBlocks.DARK_STONE_BRICK_STAIRS.get()); + this.dropSelf(ModBlocks.DARK_STONE_STAIRS.get()); this.dropSelf(ModBlocks.CASTLE_STAIRS_PURPLE_BRICK.get()); this.dropSelf(ModBlocks.STRIPPED_DARK_SPRUCE_LOG.get()); this.dropSelf(ModBlocks.STRIPPED_CURSED_SPRUCE_LOG.get()); @@ -393,9 +392,31 @@ protected void generate() { this.dropSelf(ModBlocks.DARK_SPRUCE_HANGING_SIGN.get()); this.dropSelf(ModBlocks.CURSED_SPRUCE_HANGING_SIGN.get()); this.dropOther(ModBlocks.CURSED_EARTH_PATH.get(), ModBlocks.CURSED_EARTH.get()); - this.dropSelf(ModBlocks.CASTLE_BLOCK_DARK_BRICK_CRACKED.get()); - this.dropSelf(ModBlocks.CASTLE_BLOCK_DARK_BRICK_WALL.get()); + this.dropSelf(ModBlocks.CRACKED_DARK_STONE_BRICKS.get()); this.dropSelf(ModBlocks.CASTLE_BLOCK_PURPLE_BRICK_WALL.get()); + this.add(ModBlocks.DARK_STONE.get(), block -> createSingleItemTableWithSilkTouch(block, ModBlocks.COBBLED_DARK_STONE.get())); + this.dropSelf(ModBlocks.DARK_STONE_STAIRS.get()); + this.dropSelf(ModBlocks.DARK_STONE_SLAB.get()); + this.dropSelf(ModBlocks.DARK_STONE_WALL.get()); + this.dropSelf(ModBlocks.DARK_STONE_BRICKS.get()); + this.dropSelf(ModBlocks.DARK_STONE_BRICK_STAIRS.get()); + this.dropSelf(ModBlocks.DARK_STONE_BRICK_SLAB.get()); + this.dropSelf(ModBlocks.DARK_STONE_BRICK_WALL.get()); + this.dropSelf(ModBlocks.COBBLED_DARK_STONE.get()); + this.dropSelf(ModBlocks.COBBLED_DARK_STONE_STAIRS.get()); + this.dropSelf(ModBlocks.COBBLED_DARK_STONE_SLAB.get()); + this.dropSelf(ModBlocks.COBBLED_DARK_STONE_WALL.get()); + this.dropSelf(ModBlocks.POLISHED_DARK_STONE.get()); + this.dropSelf(ModBlocks.POLISHED_DARK_STONE_STAIRS.get()); + this.dropSelf(ModBlocks.POLISHED_DARK_STONE_SLAB.get()); + this.dropSelf(ModBlocks.POLISHED_DARK_STONE_WALL.get()); + this.dropSelf(ModBlocks.DARK_STONE_TILES.get()); + this.dropSelf(ModBlocks.DARK_STONE_TILES_STAIRS.get()); + this.dropSelf(ModBlocks.DARK_STONE_TILES_SLAB.get()); + this.dropSelf(ModBlocks.DARK_STONE_TILES_WALL.get()); + this.dropSelf(ModBlocks.CRACKED_DARK_STONE_TILES.get()); + this.dropSelf(ModBlocks.CHISELED_DARK_STONE_BRICKS.get()); + this.otherWhenSilkTouch(ModBlocks.INFESTED_DARK_STONE.get(), ModBlocks.DARK_STONE.get()); } @NotNull diff --git a/src/main/java/de/teamlapen/vampirism/data/ModBlockFamilies.java b/src/main/java/de/teamlapen/vampirism/data/ModBlockFamilies.java index e4b25a9f26..768efe36aa 100644 --- a/src/main/java/de/teamlapen/vampirism/data/ModBlockFamilies.java +++ b/src/main/java/de/teamlapen/vampirism/data/ModBlockFamilies.java @@ -8,8 +8,11 @@ public class ModBlockFamilies { public static final BlockFamily DARK_SPRUCE_PLANKS = BlockFamilies.familyBuilder(ModBlocks.DARK_SPRUCE_PLANKS.get()).button(ModBlocks.DARK_SPRUCE_BUTTON.get()).fence(ModBlocks.DARK_SPRUCE_FENCE.get()).fenceGate(ModBlocks.DARK_SPRUCE_FENCE_GATE.get()).pressurePlate(ModBlocks.DARK_SPRUCE_PRESSURE_PLACE.get()).sign(ModBlocks.DARK_SPRUCE_SIGN.get(), ModBlocks.DARK_SPRUCE_WALL_SIGN.get()).slab(ModBlocks.DARK_SPRUCE_SLAB.get()).stairs(ModBlocks.DARK_SPRUCE_STAIRS.get()).door(ModBlocks.DARK_SPRUCE_DOOR.get()).trapdoor(ModBlocks.DARK_SPRUCE_TRAPDOOR.get()).recipeGroupPrefix("wooden").recipeUnlockedBy("has_planks").getFamily(); public static final BlockFamily CURSED_SPRUCE_PLANKS = BlockFamilies.familyBuilder(ModBlocks.CURSED_SPRUCE_PLANKS.get()).button(ModBlocks.CURSED_SPRUCE_BUTTON.get()).fence(ModBlocks.CURSED_SPRUCE_FENCE.get()).fenceGate(ModBlocks.CURSED_SPRUCE_FENCE_GATE.get()).pressurePlate(ModBlocks.CURSED_SPRUCE_PRESSURE_PLACE.get()).sign(ModBlocks.CURSED_SPRUCE_SIGN.get(), ModBlocks.CURSED_SPRUCE_WALL_SIGN.get()).slab(ModBlocks.CURSED_SPRUCE_SLAB.get()).stairs(ModBlocks.CURSED_SPRUCE_STAIRS.get()).door(ModBlocks.CURSED_SPRUCE_DOOR.get()).trapdoor(ModBlocks.CURSED_SPRUCE_TRAPDOOR.get()).recipeGroupPrefix("wooden").recipeUnlockedBy("has_planks").getFamily(); - public static final BlockFamily CASTLE_BRICK_DARK_BRICK = BlockFamilies.familyBuilder(ModBlocks.CASTLE_BLOCK_DARK_BRICK.get()).wall(ModBlocks.CASTLE_BLOCK_DARK_BRICK_WALL.get()).stairs(ModBlocks.CASTLE_STAIRS_DARK_BRICK.get()).slab(ModBlocks.CASTLE_SLAB_DARK_BRICK.get()).cracked(ModBlocks.CASTLE_BLOCK_DARK_BRICK_CRACKED.get()).getFamily(); - public static final BlockFamily CASTLE_BRICK_DARK_STONE = BlockFamilies.familyBuilder(ModBlocks.CASTLE_BLOCK_DARK_STONE.get()).stairs(ModBlocks.CASTLE_STAIRS_DARK_STONE.get()).slab(ModBlocks.CASTLE_SLAB_DARK_STONE.get()).getFamily(); + public static final BlockFamily DARK_BRICKS = BlockFamilies.familyBuilder(ModBlocks.DARK_STONE_BRICKS.get()).wall(ModBlocks.DARK_STONE_BRICK_WALL.get()).stairs(ModBlocks.DARK_STONE_BRICK_STAIRS.get()).slab(ModBlocks.DARK_STONE_BRICK_SLAB.get()).cracked(ModBlocks.CRACKED_DARK_STONE_BRICKS.get()).chiseled(ModBlocks.CHISELED_DARK_STONE_BRICKS.get()).getFamily(); + public static final BlockFamily DARK_STONE = BlockFamilies.familyBuilder(ModBlocks.DARK_STONE.get()).stairs(ModBlocks.DARK_STONE_STAIRS.get()).slab(ModBlocks.DARK_STONE_SLAB.get()).wall(ModBlocks.DARK_STONE_WALL.get()).getFamily(); + public static final BlockFamily COBBLED_DARK_STONE = BlockFamilies.familyBuilder(ModBlocks.COBBLED_DARK_STONE.get()).stairs(ModBlocks.COBBLED_DARK_STONE_STAIRS.get()).slab(ModBlocks.COBBLED_DARK_STONE_SLAB.get()).polished(ModBlocks.POLISHED_DARK_STONE.get()).wall(ModBlocks.COBBLED_DARK_STONE_WALL.get()).getFamily(); + public static final BlockFamily POLISHED_DARK_STONE = BlockFamilies.familyBuilder(ModBlocks.POLISHED_DARK_STONE.get()).stairs(ModBlocks.POLISHED_DARK_STONE_STAIRS.get()).slab(ModBlocks.POLISHED_DARK_STONE_SLAB.get()).wall(ModBlocks.POLISHED_DARK_STONE_WALL.get()).getFamily(); + public static final BlockFamily DARK_STONE_TILES = BlockFamilies.familyBuilder(ModBlocks.DARK_STONE_TILES.get()).stairs(ModBlocks.DARK_STONE_TILES_STAIRS.get()).slab(ModBlocks.DARK_STONE_TILES_SLAB.get()).wall(ModBlocks.DARK_STONE_TILES_WALL.get()).cracked(ModBlocks.CRACKED_DARK_STONE_TILES.get()).getFamily(); public static final BlockFamily CASTLE_BRICK_PURPLE_BRICK = BlockFamilies.familyBuilder(ModBlocks.CASTLE_BLOCK_PURPLE_BRICK.get()).wall(ModBlocks.CASTLE_BLOCK_PURPLE_BRICK_WALL.get()).stairs(ModBlocks.CASTLE_STAIRS_PURPLE_BRICK.get()).slab(ModBlocks.CASTLE_SLAB_PURPLE_BRICK.get()).getFamily(); diff --git a/src/main/java/de/teamlapen/vampirism/data/RecipesGenerator.java b/src/main/java/de/teamlapen/vampirism/data/RecipesGenerator.java index 377f7711e5..923fa4767e 100644 --- a/src/main/java/de/teamlapen/vampirism/data/RecipesGenerator.java +++ b/src/main/java/de/teamlapen/vampirism/data/RecipesGenerator.java @@ -58,13 +58,8 @@ public RecipesGenerator(@NotNull PackOutput packOutput) { protected void buildRecipes(@NotNull Consumer consumer) { ItemLike hopper = Blocks.HOPPER; ItemLike cauldron = Blocks.CAULDRON; - ItemLike black_dye = Items.BLACK_DYE; ItemLike stone_bricks = Blocks.STONE_BRICKS; ItemLike vampire_orchid = ModBlocks.VAMPIRE_ORCHID.get(); - ItemLike stone = Blocks.STONE; - ItemLike castle_block_dark_brick = ModBlocks.CASTLE_BLOCK_DARK_BRICK.get(); - ItemLike castle_block_dark_stone = ModBlocks.CASTLE_BLOCK_DARK_STONE.get(); - ItemLike castle_block_normal_brick = ModBlocks.CASTLE_BLOCK_NORMAL_BRICK.get(); ItemLike castle_block_purple_brick = ModBlocks.CASTLE_BLOCK_PURPLE_BRICK.get(); ItemLike vampire_book = ModItems.VAMPIRE_BOOK.get(); ItemLike vampire_fang = ModItems.VAMPIRE_FANG.get(); @@ -126,16 +121,8 @@ protected void buildRecipes(@NotNull Consumer consumer) { ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, ModBlocks.BLOOD_GRINDER.get()).define('Z', hopper).define('Y', planks).define('D', diamond).define('X', iron_ingot).pattern(" Z ").pattern("YDY").pattern("YXY").unlockedBy("has_hopper", has(hopper)).save(consumer, general("blood_grinder")); ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, ModBlocks.BLOOD_SIEVE.get()).define('X', iron_ingot).define('Q', quartz_block).define('Y', planks).define('Z', cauldron).pattern("XQX").pattern("YZY").pattern("YXY").unlockedBy("has_cauldron", has(cauldron)).save(consumer, general("blood_sieve")); - ShapelessRecipeBuilder.shapeless(RecipeCategory.DECORATIONS, ModBlocks.CASTLE_BLOCK_DARK_BRICK.get(), 8).requires(castle_block_normal_brick, 8).requires(black_dye).unlockedBy("has_castle_brick", has(castle_block_normal_brick)).unlockedBy("has_black_dye", has(black_dye)).save(consumer, modId("general/castle_block_dark_brick_0")); - ShapelessRecipeBuilder.shapeless(RecipeCategory.DECORATIONS, ModBlocks.CASTLE_BLOCK_DARK_BRICK.get(), 7).requires(stone_bricks, 7).requires(black_dye).requires(vampire_orchid).unlockedBy("has_orchid", has(vampire_orchid)).save(consumer, general("castle_block_dark_brick_1")); - ShapelessRecipeBuilder.shapeless(RecipeCategory.DECORATIONS, ModBlocks.CASTLE_BLOCK_DARK_STONE.get(), 7).requires(stone, 7).requires(black_dye).requires(vampire_orchid).unlockedBy("has_orchid", has(vampire_orchid)).save(consumer, general("castle_block_dark_stone")); - ShapelessRecipeBuilder.shapeless(RecipeCategory.DECORATIONS, ModBlocks.CASTLE_BLOCK_NORMAL_BRICK.get(), 8).requires(stone_bricks, 8).requires(vampire_orchid).unlockedBy("has_orchid", has(vampire_orchid)).save(consumer, general("castle_block_normal_brick")); - ShapelessRecipeBuilder.shapeless(RecipeCategory.DECORATIONS, ModBlocks.CASTLE_BLOCK_PURPLE_BRICK.get(), 8).requires(castle_block_normal_brick, 8).requires(vampire_orchid).unlockedBy("has_orchid", has(vampire_orchid)).save(consumer, general("castle_block_purple_brick")); - ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, ModBlocks.CASTLE_SLAB_DARK_BRICK.get(), 6).pattern("###").define('#', castle_block_dark_brick).unlockedBy("has_castle_brick", has(castle_block_dark_brick)).save(consumer, modId("general/castle_slab_dark_brick")); - ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, ModBlocks.CASTLE_SLAB_DARK_STONE.get(), 6).pattern("###").define('#', castle_block_dark_stone).unlockedBy("has_castle_brick", has(castle_block_dark_stone)).save(consumer, modId("general/castle_slab_dark_stone")); + ShapelessRecipeBuilder.shapeless(RecipeCategory.DECORATIONS, ModBlocks.CASTLE_BLOCK_PURPLE_BRICK.get(), 8).requires(stone_bricks, 8).requires(vampire_orchid).unlockedBy("has_orchid", has(vampire_orchid)).save(consumer, general("castle_block_purple_brick")); ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, ModBlocks.CASTLE_SLAB_PURPLE_BRICK.get(), 6).pattern("###").define('#', castle_block_purple_brick).unlockedBy("has_castle_brick", has(castle_block_purple_brick)).save(consumer, modId("general/castle_slab_purple_brick")); - ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, ModBlocks.CASTLE_STAIRS_DARK_BRICK.get(), 4).pattern("# ").pattern("## ").pattern("###").define('#', castle_block_dark_brick).unlockedBy("has_castle_brick", has(castle_block_dark_brick)).save(consumer, modId("general/castle_stairs_dark_brick")); - ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, ModBlocks.CASTLE_STAIRS_DARK_STONE.get(), 4).pattern("# ").pattern("## ").pattern("###").define('#', castle_block_dark_stone).unlockedBy("has_castle_brick", has(castle_block_dark_stone)).save(consumer, general("castle_stairs_dark_stone")); ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, ModBlocks.CASTLE_STAIRS_PURPLE_BRICK.get(), 4).pattern("# ").pattern("## ").pattern("###").define('#', castle_block_purple_brick).unlockedBy("has_castle_brick", has(castle_block_purple_brick)).save(consumer, general("castle_stairs_purple_brick")); ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, ModBlocks.ALTAR_CLEANSING.get()).pattern(" X ").pattern("YYY").pattern(" Y ").define('X', vampire_book).define('Y', planks).unlockedBy("has_vampire_book", has(planks)).save(consumer, general("altar_cleansing")); ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, ModBlocks.ALTAR_CLEANSING.get()).pattern("XZX").pattern("YYY").pattern(" Y ").define('X', vampire_fang).define('Y', planks).define('Z', book).unlockedBy("has_book", has(book)).save(consumer, general("altar_cleansing_new")); @@ -163,17 +150,6 @@ protected void buildRecipes(@NotNull Consumer consumer) { ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, ModItems.PURE_BLOOD_2.get()).requires(ModItems.PURE_BLOOD_3.get()).requires(ModItems.VAMPIRE_BLOOD_BOTTLE.get()).unlockedBy("has_pure_blood", has(pure_blood_3)).save(consumer, hunter("pure_blood2")); ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, ModItems.PURE_BLOOD_3.get()).requires(ModItems.PURE_BLOOD_4.get()).requires(ModItems.VAMPIRE_BLOOD_BOTTLE.get()).unlockedBy("has_pure_blood", has(pure_blood_4)).save(consumer, hunter("pure_blood3")); - SingleItemRecipeBuilder.stonecutting(Ingredient.of(castle_block_dark_stone), RecipeCategory.BUILDING_BLOCKS, ModBlocks.CASTLE_BLOCK_DARK_BRICK.get()).unlockedBy("has_castle_stone", has(castle_block_dark_stone)).save(consumer, modId("stonecutting/castle_block_dark_brick_from_castle_block_dark_brick")); - SingleItemRecipeBuilder.stonecutting(Ingredient.of(castle_block_dark_stone), RecipeCategory.BUILDING_BLOCKS, ModBlocks.CASTLE_STAIRS_DARK_STONE.get()).unlockedBy("has_stone", has(castle_block_dark_stone)).save(consumer, modId("stonecutting/castle_stairs_dark_stone_from_castle_block_dark_stone")); - SingleItemRecipeBuilder.stonecutting(Ingredient.of(castle_block_dark_brick), RecipeCategory.BUILDING_BLOCKS, ModBlocks.CASTLE_STAIRS_DARK_STONE.get()).unlockedBy("has_stone", has(castle_block_dark_brick)).save(consumer, modId("stonecutting/castle_stairs_dark_stone_from_castle_block_dark_brick")); - SingleItemRecipeBuilder.stonecutting(Ingredient.of(castle_block_dark_brick), RecipeCategory.BUILDING_BLOCKS, ModBlocks.CASTLE_STAIRS_DARK_BRICK.get()).unlockedBy("has_stone", has(castle_block_dark_brick)).save(consumer, modId("stonecutting/castle_stairs_dark_brick_from_castle_block_dark_brick")); - SingleItemRecipeBuilder.stonecutting(Ingredient.of(castle_block_dark_stone), RecipeCategory.BUILDING_BLOCKS, ModBlocks.CASTLE_STAIRS_DARK_BRICK.get()).unlockedBy("has_stone", has(castle_block_dark_stone)).save(consumer, modId("stonecutting/castle_stairs_dark_brick_from_castle_block_dark_stone")); - SingleItemRecipeBuilder.stonecutting(Ingredient.of(castle_block_purple_brick), RecipeCategory.BUILDING_BLOCKS, ModBlocks.CASTLE_STAIRS_PURPLE_BRICK.get()).unlockedBy("has_stone", has(castle_block_purple_brick)).save(consumer, modId("stonecutting/castle_stairs_purple_brick_from_castle_block_purple_brick")); - - SingleItemRecipeBuilder.stonecutting(Ingredient.of(castle_block_dark_stone), RecipeCategory.BUILDING_BLOCKS, ModBlocks.CASTLE_SLAB_DARK_STONE.get(), 2).unlockedBy("has_stone", has(castle_block_dark_stone)).save(consumer, modId("stonecutting/castle_slaps_dark_stone_from_castle_block_dark_stone")); - SingleItemRecipeBuilder.stonecutting(Ingredient.of(castle_block_dark_stone), RecipeCategory.BUILDING_BLOCKS, ModBlocks.CASTLE_SLAB_DARK_BRICK.get(), 2).unlockedBy("has_stone", has(castle_block_dark_stone)).save(consumer, modId("stonecutting/castle_slaps_dark_brick_from_castle_block_dark_stone")); - SingleItemRecipeBuilder.stonecutting(Ingredient.of(castle_block_dark_brick), RecipeCategory.BUILDING_BLOCKS, ModBlocks.CASTLE_SLAB_DARK_BRICK.get(), 2).unlockedBy("has_stone", has(castle_block_dark_brick)).save(consumer, modId("stonecutting/castle_slaps_dark_brick_from_castle_block_dark_brick")); - SingleItemRecipeBuilder.stonecutting(Ingredient.of(castle_block_dark_brick), RecipeCategory.BUILDING_BLOCKS, ModBlocks.CASTLE_SLAB_DARK_STONE.get(), 2).unlockedBy("has_stone", has(castle_block_dark_brick)).save(consumer, modId("stonecutting/castle_slaps_dark_stone_from_castle_block_dark_brick")); SingleItemRecipeBuilder.stonecutting(Ingredient.of(castle_block_purple_brick), RecipeCategory.BUILDING_BLOCKS, ModBlocks.CASTLE_SLAB_PURPLE_BRICK.get(), 2).unlockedBy("has_stone", has(castle_block_purple_brick)).save(consumer, modId("stonecutting/castle_slaps_purple_brick_from_castle_block_purple_brick")); AlchemicalCauldronRecipeBuilder.cauldronRecipe(ModItems.PURE_SALT.get(), 4).withIngredient(garlic).withFluid(new FluidStack(Fluids.WATER, 1)).withSkills(HunterSkills.BASIC_ALCHEMY.get()).cookTime(1200).build(consumer, modId("pure_salt")); @@ -285,9 +261,12 @@ protected void buildRecipes(@NotNull Consumer consumer) { generateRecipes(consumer, ModBlockFamilies.DARK_SPRUCE_PLANKS); generateRecipes(consumer, ModBlockFamilies.CURSED_SPRUCE_PLANKS); - generateRecipes(consumer, ModBlockFamilies.CASTLE_BRICK_DARK_STONE); + generateRecipes(consumer, ModBlockFamilies.DARK_STONE); generateRecipes(consumer, ModBlockFamilies.CASTLE_BRICK_PURPLE_BRICK); - generateRecipes(consumer, ModBlockFamilies.CASTLE_BRICK_DARK_BRICK); + generateRecipes(consumer, ModBlockFamilies.DARK_BRICKS); + generateRecipes(consumer, ModBlockFamilies.POLISHED_DARK_STONE); + generateRecipes(consumer, ModBlockFamilies.COBBLED_DARK_STONE); + generateRecipes(consumer, ModBlockFamilies.DARK_STONE_TILES); planksFromLog(consumer, ModBlocks.DARK_SPRUCE_PLANKS.get(), ModTags.Items.DARK_SPRUCE_LOG, 4); planksFromLog(consumer, ModBlocks.CURSED_SPRUCE_PLANKS.get(), ModTags.Items.CURSED_SPRUCE_LOG, 4); @@ -415,8 +394,42 @@ protected void buildRecipes(@NotNull Consumer consumer) { ShapelessRecipeBuilder.shapeless(RecipeCategory.DECORATIONS, holy_water_bottle_enhanced, 2).requires(holy_water_bottle_ultimate).requires(ModItems.PURE_SALT_WATER.get()).unlockedBy("has_ultimate_holy_water", has(holy_water_bottle_enhanced)).save(consumer, "holy_water_bottle_enhanced_from_ultimate"); hangingSign(consumer, ModItems.DARK_SPRUCE_HANGING_SIGN.get(), ModBlocks.STRIPPED_DARK_SPRUCE_LOG.get()); hangingSign(consumer, ModItems.CURSED_SPRUCE_HANGING_SIGN.get(), ModBlocks.STRIPPED_CURSED_SPRUCE_LOG.get()); - stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.CASTLE_BLOCK_DARK_BRICK_WALL.get(), ModBlocks.CASTLE_BLOCK_DARK_BRICK.get()); stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.CASTLE_BLOCK_PURPLE_BRICK_WALL.get(), ModBlocks.CASTLE_BLOCK_PURPLE_BRICK.get()); + stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.COBBLED_DARK_STONE_SLAB.get(), ModBlocks.COBBLED_DARK_STONE.get(), 2); + stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.COBBLED_DARK_STONE_STAIRS.get(), ModBlocks.COBBLED_DARK_STONE.get()); + stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.COBBLED_DARK_STONE_WALL.get(), ModBlocks.COBBLED_DARK_STONE.get()); + stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.POLISHED_DARK_STONE.get(), ModBlocks.COBBLED_DARK_STONE.get()); + stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.POLISHED_DARK_STONE_SLAB.get(), ModBlocks.POLISHED_DARK_STONE.get(), 2); + stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.POLISHED_DARK_STONE_STAIRS.get(), ModBlocks.POLISHED_DARK_STONE.get()); + stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.POLISHED_DARK_STONE_WALL.get(), ModBlocks.POLISHED_DARK_STONE.get()); + stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.POLISHED_DARK_STONE_SLAB.get(), ModBlocks.COBBLED_DARK_STONE.get(), 2); + stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.POLISHED_DARK_STONE_STAIRS.get(), ModBlocks.COBBLED_DARK_STONE.get()); + stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.POLISHED_DARK_STONE_WALL.get(), ModBlocks.COBBLED_DARK_STONE.get()); + stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.DARK_STONE_BRICKS.get(), ModBlocks.POLISHED_DARK_STONE.get()); + stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.DARK_STONE_BRICKS.get(), ModBlocks.COBBLED_DARK_STONE.get()); + stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.DARK_STONE_BRICK_STAIRS.get(), ModBlocks.COBBLED_DARK_STONE.get()); + stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.DARK_STONE_BRICK_STAIRS.get(), ModBlocks.DARK_STONE_BRICKS.get()); + stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.DARK_STONE_BRICK_STAIRS.get(), ModBlocks.POLISHED_DARK_STONE.get()); + stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.DARK_STONE_BRICK_SLAB.get(), ModBlocks.COBBLED_DARK_STONE.get(),2); + stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.DARK_STONE_BRICK_SLAB.get(), ModBlocks.DARK_STONE_BRICKS.get(),2); + stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.DARK_STONE_BRICK_SLAB.get(), ModBlocks.POLISHED_DARK_STONE.get(),2); + stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.DARK_STONE_BRICK_WALL.get(), ModBlocks.COBBLED_DARK_STONE.get()); + stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.DARK_STONE_BRICK_WALL.get(), ModBlocks.DARK_STONE_BRICKS.get()); + stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.DARK_STONE_BRICK_WALL.get(), ModBlocks.POLISHED_DARK_STONE.get()); + stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.DARK_STONE_TILES.get(), ModBlocks.POLISHED_DARK_STONE.get()); + stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.DARK_STONE_TILES.get(), ModBlocks.COBBLED_DARK_STONE.get()); + stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.DARK_STONE_TILES.get(), ModBlocks.DARK_STONE_BRICKS.get()); + stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.DARK_STONE_TILES_STAIRS.get(), ModBlocks.DARK_STONE_BRICKS.get()); + stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.DARK_STONE_TILES_STAIRS.get(), ModBlocks.DARK_STONE_TILES.get()); + stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.DARK_STONE_TILES_STAIRS.get(), ModBlocks.COBBLED_DARK_STONE.get()); + stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.DARK_STONE_TILES_SLAB.get(), ModBlocks.DARK_STONE_BRICKS.get(), 2); + stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.DARK_STONE_TILES_SLAB.get(), ModBlocks.DARK_STONE_TILES.get(), 2); + stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.DARK_STONE_TILES_SLAB.get(), ModBlocks.COBBLED_DARK_STONE.get(), 2); + stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.DARK_STONE_TILES_WALL.get(), ModBlocks.DARK_STONE_BRICKS.get()); + stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.DARK_STONE_TILES_WALL.get(), ModBlocks.DARK_STONE_TILES.get()); + stonecutterResultFromBase(consumer, RecipeCategory.DECORATIONS, ModBlocks.DARK_STONE_TILES_WALL.get(), ModBlocks.COBBLED_DARK_STONE.get()); + SimpleCookingRecipeBuilder.smelting(Ingredient.of(ModBlocks.COBBLED_DARK_STONE.get()), RecipeCategory.BUILDING_BLOCKS, ModBlocks.DARK_STONE.get(),0.1f, 200).unlockedBy("has_cobbled_dark_stone", has(ModBlocks.COBBLED_DARK_STONE.get())).save(consumer, new ResourceLocation(REFERENCE.MODID, "dark_stone_from_cobbled_dark_stone_smelting")); + SimpleCookingRecipeBuilder.blasting(Ingredient.of(ModBlocks.COBBLED_DARK_STONE.get()), RecipeCategory.BUILDING_BLOCKS, ModBlocks.DARK_STONE.get(),0.1f, 100).unlockedBy("has_cobbled_dark_stone", has(ModBlocks.COBBLED_DARK_STONE.get())).save(consumer, new ResourceLocation(REFERENCE.MODID, "dark_stone_from_cobbled_dark_stone_blasting")); } private @NotNull JsonObject enchantment(int level, Enchantment enchantment) { diff --git a/src/main/java/de/teamlapen/vampirism/data/TagGenerator.java b/src/main/java/de/teamlapen/vampirism/data/TagGenerator.java index 219453389d..555750c255 100644 --- a/src/main/java/de/teamlapen/vampirism/data/TagGenerator.java +++ b/src/main/java/de/teamlapen/vampirism/data/TagGenerator.java @@ -58,11 +58,9 @@ public String getName() { protected void addTags(HolderLookup.Provider holderLookup) { tag(BlockTags.DIRT).add(ModBlocks.CURSED_EARTH.get(), ModBlocks.CURSED_GRASS.get()); tag(ModTags.Blocks.CURSED_EARTH).add(ModBlocks.CURSED_EARTH.get(), ModBlocks.CURSED_GRASS.get()); - tag(ModTags.Blocks.CASTLE_BLOCK).add(ModBlocks.CASTLE_BLOCK_DARK_BRICK.get(), ModBlocks.CASTLE_BLOCK_DARK_BRICK_BLOODY.get(), ModBlocks.CASTLE_BLOCK_DARK_STONE.get(), ModBlocks.CASTLE_BLOCK_NORMAL_BRICK.get(), ModBlocks.CASTLE_BLOCK_PURPLE_BRICK.get(), ModBlocks.CASTLE_BLOCK_DARK_BRICK_CRACKED.get()); - tag(ModTags.Blocks.CASTLE_SLAPS).add(ModBlocks.CASTLE_SLAB_DARK_BRICK.get(), ModBlocks.CASTLE_SLAB_DARK_STONE.get(), ModBlocks.CASTLE_SLAB_PURPLE_BRICK.get()); - tag(ModTags.Blocks.CASTLE_STAIRS).add(ModBlocks.CASTLE_STAIRS_DARK_STONE.get(), ModBlocks.CASTLE_STAIRS_DARK_BRICK.get(), ModBlocks.CASTLE_STAIRS_PURPLE_BRICK.get()); - tag(BlockTags.STAIRS).addTag(ModTags.Blocks.CASTLE_STAIRS); - tag(BlockTags.SLABS).addTag(ModTags.Blocks.CASTLE_SLAPS); + tag(ModTags.Blocks.CASTLE_BLOCK).add(ModBlocks.DARK_STONE_BRICKS.get(), ModBlocks.BLOODY_DARK_STONE_BRICKS.get(), ModBlocks.DARK_STONE.get(), ModBlocks.CASTLE_BLOCK_PURPLE_BRICK.get(), ModBlocks.CRACKED_DARK_STONE_BRICKS.get()); + tag(ModTags.Blocks.CASTLE_SLAPS).add(ModBlocks.DARK_STONE_BRICK_SLAB.get(), ModBlocks.DARK_STONE_SLAB.get(), ModBlocks.CASTLE_SLAB_PURPLE_BRICK.get()); + tag(ModTags.Blocks.CASTLE_STAIRS).add(ModBlocks.DARK_STONE_STAIRS.get(), ModBlocks.DARK_STONE_BRICK_STAIRS.get(), ModBlocks.CASTLE_STAIRS_PURPLE_BRICK.get()); tag(BlockTags.FLOWER_POTS).add(ModBlocks.POTTED_VAMPIRE_ORCHID.get()); // Tool Types @@ -98,6 +96,11 @@ protected void addTags(HolderLookup.Provider holderLookup) { .addTag(ModTags.Blocks.CASTLE_SLAPS) .addTag(ModTags.Blocks.CASTLE_STAIRS) .addTag(ModTags.Blocks.TOTEM_TOP) + .addTag(ModTags.Blocks.DARK_STONE) + .addTag(ModTags.Blocks.DARK_STONE_BRICKS) + .addTag(ModTags.Blocks.DARK_STONE_TILES) + .addTag(ModTags.Blocks.POLISHED_DARK_STONE) + .addTag(ModTags.Blocks.COBBLED_DARK_STONE) ; tag(BlockTags.MINEABLE_WITH_AXE) .add(ModBlocks.ALTAR_INSPIRATION.get()) @@ -171,7 +174,17 @@ protected void addTags(HolderLookup.Provider holderLookup) { tag(ModTags.Blocks.COFFIN).add(ModBlocks.COFFIN_RED.get()).add(ModBlocks.COFFIN_BLUE.get()).add(ModBlocks.COFFIN_GREEN.get()).add(ModBlocks.COFFIN_BROWN.get()).add(ModBlocks.COFFIN_BLACK.get()).add(ModBlocks.COFFIN_GRAY.get()).add(ModBlocks.COFFIN_LIGHT_BLUE.get()).add(ModBlocks.COFFIN_WHITE.get()).add(ModBlocks.COFFIN_LIGHT_GRAY.get()).add(ModBlocks.COFFIN_CYAN.get()).add(ModBlocks.COFFIN_PURPLE.get()).add(ModBlocks.COFFIN_PINK.get()).add(ModBlocks.COFFIN_LIME.get()).add(ModBlocks.COFFIN_YELLOW.get()).add(ModBlocks.COFFIN_ORANGE.get()).add(ModBlocks.COFFIN_MAGENTA.get()); tag(BlockTags.CEILING_HANGING_SIGNS).add(ModBlocks.DARK_SPRUCE_HANGING_SIGN.get(), ModBlocks.CURSED_SPRUCE_HANGING_SIGN.get()); tag(BlockTags.WALL_HANGING_SIGNS).add(ModBlocks.DARK_SPRUCE_WALL_HANGING_SIGN.get(), ModBlocks.CURSED_SPRUCE_WALL_HANGING_SIGN.get()); - tag(BlockTags.WALLS).add(ModBlocks.CASTLE_BLOCK_DARK_BRICK_WALL.get(), ModBlocks.CASTLE_BLOCK_PURPLE_BRICK_WALL.get()); + tag(ModTags.Blocks.DARK_STONE).add(ModBlocks.DARK_STONE.get(), ModBlocks.DARK_STONE_STAIRS.get(), ModBlocks.DARK_STONE_WALL.get(), ModBlocks.DARK_STONE_SLAB.get(), ModBlocks.DARK_STONE_TILES.get(), ModBlocks.INFESTED_DARK_STONE.get()); + tag(ModTags.Blocks.DARK_STONE_BRICKS).add(ModBlocks.DARK_STONE_BRICKS.get(), ModBlocks.DARK_STONE_BRICK_WALL.get(), ModBlocks.DARK_STONE_BRICK_SLAB.get(), ModBlocks.DARK_STONE_STAIRS.get(), ModBlocks.CHISELED_DARK_STONE_BRICKS.get(), ModBlocks.BLOODY_DARK_STONE_BRICKS.get(), ModBlocks.CRACKED_DARK_STONE_BRICKS.get()); + tag(ModTags.Blocks.POLISHED_DARK_STONE).add(ModBlocks.POLISHED_DARK_STONE.get(), ModBlocks.POLISHED_DARK_STONE_STAIRS.get(), ModBlocks.POLISHED_DARK_STONE_SLAB.get(), ModBlocks.POLISHED_DARK_STONE_WALL.get()); + tag(ModTags.Blocks.COBBLED_DARK_STONE).add(ModBlocks.COBBLED_DARK_STONE.get(), ModBlocks.COBBLED_DARK_STONE_STAIRS.get(), ModBlocks.COBBLED_DARK_STONE_SLAB.get(), ModBlocks.POLISHED_DARK_STONE_WALL.get()); + tag(ModTags.Blocks.DARK_STONE_TILES).add(ModBlocks.DARK_STONE_TILES.get(), ModBlocks.DARK_STONE_TILES_STAIRS.get(), ModBlocks.DARK_STONE_TILES_SLAB.get(), ModBlocks.DARK_STONE_TILES_WALL.get(), ModBlocks.CRACKED_DARK_STONE_TILES.get()); + tag(ModTags.Blocks.NO_SPAWN).addTag(ModTags.Blocks.DARK_STONE); + tag(ModTags.Blocks.VAMPIRE_SPAWN).addTags(ModTags.Blocks.DARK_STONE_BRICKS, ModTags.Blocks.COBBLED_DARK_STONE, ModTags.Blocks.POLISHED_DARK_STONE, ModTags.Blocks.DARK_STONE_TILES); + tag(Tags.Blocks.STONE).add(ModBlocks.DARK_STONE.get(), ModBlocks.INFESTED_DARK_STONE.get(), ModBlocks.POLISHED_DARK_STONE.get()); + tag(BlockTags.WALLS).add(ModBlocks.DARK_STONE_BRICK_WALL.get(), ModBlocks.POLISHED_DARK_STONE_WALL.get(), ModBlocks.COBBLED_DARK_STONE_WALL.get(), ModBlocks.DARK_STONE_WALL.get(), ModBlocks.DARK_STONE_TILES_WALL.get(), ModBlocks.CASTLE_BLOCK_PURPLE_BRICK_WALL.get()); + tag(BlockTags.STAIRS).add(ModBlocks.DARK_STONE_BRICK_STAIRS.get(), ModBlocks.POLISHED_DARK_STONE_STAIRS.get(), ModBlocks.COBBLED_DARK_STONE_STAIRS.get(), ModBlocks.DARK_STONE_STAIRS.get(), ModBlocks.DARK_STONE_TILES_STAIRS.get(), ModBlocks.CASTLE_STAIRS_PURPLE_BRICK.get()); + tag(BlockTags.SLABS).add(ModBlocks.DARK_STONE_BRICK_SLAB.get(), ModBlocks.POLISHED_DARK_STONE_SLAB.get(), ModBlocks.COBBLED_DARK_STONE_SLAB.get(), ModBlocks.DARK_STONE_SLAB.get(), ModBlocks.DARK_STONE_TILES_SLAB.get(), ModBlocks.CASTLE_SLAB_PURPLE_BRICK.get()); } } @@ -194,6 +207,13 @@ protected void addTags(HolderLookup.@NotNull Provider holderProvider) { copy(ModTags.Blocks.CURSED_EARTH, ModTags.Items.CURSEDEARTH); copy(ModTags.Blocks.DARK_SPRUCE_LOG, ModTags.Items.DARK_SPRUCE_LOG); copy(ModTags.Blocks.CURSED_SPRUCE_LOG, ModTags.Items.CURSED_SPRUCE_LOG); + copy(ModTags.Blocks.DARK_STONE, ModTags.Items.DARK_STONE); + copy(ModTags.Blocks.DARK_STONE_BRICKS, ModTags.Items.DARK_STONE_BRICKS); + copy(ModTags.Blocks.POLISHED_DARK_STONE, ModTags.Items.POLISHED_DARK_STONE); + copy(ModTags.Blocks.COBBLED_DARK_STONE, ModTags.Items.COBBLED_DARK_STONE); + copy(ModTags.Blocks.DARK_STONE_TILES, ModTags.Items.DARK_STONE_TILES); + copy(ModTags.Blocks.NO_SPAWN, ModTags.Items.NO_SPAWN); + copy(ModTags.Blocks.VAMPIRE_SPAWN, ModTags.Items.VAMPIRE_SPAWN); copy(BlockTags.LOGS_THAT_BURN, ItemTags.LOGS_THAT_BURN); copy(BlockTags.LOGS, ItemTags.LOGS); copy(BlockTags.WOODEN_TRAPDOORS, ItemTags.WOODEN_TRAPDOORS); @@ -206,6 +226,9 @@ protected void addTags(HolderLookup.@NotNull Provider holderProvider) { copy(BlockTags.PLANKS, ItemTags.PLANKS); copy(BlockTags.SAPLINGS, ItemTags.SAPLINGS); copy(BlockTags.LEAVES, ItemTags.LEAVES); + copy(BlockTags.STAIRS, ItemTags.STAIRS); + copy(BlockTags.SLABS, ItemTags.SLABS); + copy(BlockTags.WALLS, ItemTags.WALLS); tag(ModTags.Items.CROSSBOW_ARROW).add(ModItems.CROSSBOW_ARROW_NORMAL.get(), ModItems.CROSSBOW_ARROW_SPITFIRE.get(), ModItems.CROSSBOW_ARROW_VAMPIRE_KILLER.get()); tag(ModTags.Items.HUNTER_INTEL).add(ModItems.HUNTER_INTEL_0.get(), ModItems.HUNTER_INTEL_1.get(), ModItems.HUNTER_INTEL_2.get(), ModItems.HUNTER_INTEL_3.get(), ModItems.HUNTER_INTEL_4.get(), ModItems.HUNTER_INTEL_5.get(), ModItems.HUNTER_INTEL_6.get(), ModItems.HUNTER_INTEL_7.get(), ModItems.HUNTER_INTEL_8.get(), ModItems.HUNTER_INTEL_9.get()); diff --git a/src/main/java/de/teamlapen/vampirism/entity/ModEntityEventHandler.java b/src/main/java/de/teamlapen/vampirism/entity/ModEntityEventHandler.java index cbea42e906..410b0b2a8b 100755 --- a/src/main/java/de/teamlapen/vampirism/entity/ModEntityEventHandler.java +++ b/src/main/java/de/teamlapen/vampirism/entity/ModEntityEventHandler.java @@ -5,13 +5,9 @@ import de.teamlapen.vampirism.api.difficulty.Difficulty; import de.teamlapen.vampirism.api.difficulty.IAdjustableLevel; import de.teamlapen.vampirism.api.entity.IExtendedCreatureVampirism; -import de.teamlapen.vampirism.api.entity.factions.IFactionEntity; import de.teamlapen.vampirism.api.items.IItemWithTier; import de.teamlapen.vampirism.api.items.oil.IWeaponOil; import de.teamlapen.vampirism.blockentity.TotemBlockEntity; -import de.teamlapen.vampirism.blocks.CastleBricksBlock; -import de.teamlapen.vampirism.blocks.CastleSlabBlock; -import de.teamlapen.vampirism.blocks.CastleStairsBlock; import de.teamlapen.vampirism.config.VampirismConfig; import de.teamlapen.vampirism.core.ModTags; import de.teamlapen.vampirism.entity.ai.goals.GolemTargetNonVillageFactionGoal; @@ -48,7 +44,6 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.item.PotionItem; -import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.event.AttachCapabilitiesEvent; import net.minecraftforge.event.entity.EntityEvent; @@ -115,21 +110,8 @@ public void onFinalizeSpawn(@NotNull MobSpawnEvent.FinalizeSpawn event) { BlockPos pos = new BlockPos((int) (event.getX() - 0.4F), (int) event.getY(), (int) (event.getZ() - 0.4F)).below(); if (!event.getLevel().hasChunkAt(pos)) return; BlockState blockState = event.getLevel().getBlockState(pos); - Block b = blockState.getBlock(); - boolean deny = false; - CastleBricksBlock.EnumVariant v = null; - - if (b instanceof CastleBricksBlock) { - deny = true; - v = ((CastleBricksBlock) b).getVariant(); - } else if (b instanceof CastleSlabBlock) { - deny = true; - v = ((CastleSlabBlock) b).getVariant(); - } else if (b instanceof CastleStairsBlock) { - deny = true; - v = ((CastleStairsBlock) b).getVariant(); - } - if (deny && (v == CastleBricksBlock.EnumVariant.DARK_STONE || !(event.getEntity().getClassification(false) == VReference.VAMPIRE_CREATURE_TYPE))) { + + if (blockState.is(ModTags.Blocks.NO_SPAWN) || (blockState.is(ModTags.Blocks.VAMPIRE_SPAWN) || event.getEntity().getClassification(false) == VReference.VAMPIRE_CREATURE_TYPE)) { event.setSpawnCancelled(true); } } diff --git a/src/main/java/de/teamlapen/vampirism/misc/VampirismCreativeTab.java b/src/main/java/de/teamlapen/vampirism/misc/VampirismCreativeTab.java index 965f40e72d..fb6d530988 100644 --- a/src/main/java/de/teamlapen/vampirism/misc/VampirismCreativeTab.java +++ b/src/main/java/de/teamlapen/vampirism/misc/VampirismCreativeTab.java @@ -200,20 +200,35 @@ private void addBuildingBlocks() { addItem(ModItems.CURSED_SPRUCE_SIGN); addItem(ModItems.CURSED_SPRUCE_HANGING_SIGN); - addBlock(CASTLE_BLOCK_DARK_STONE); - addBlock(CASTLE_STAIRS_DARK_STONE); - addBlock(CASTLE_SLAB_DARK_STONE); - addBlock(CASTLE_BLOCK_DARK_BRICK); - addBlock(CASTLE_STAIRS_DARK_BRICK); - addBlock(CASTLE_SLAB_DARK_BRICK); - addBlock(CASTLE_BLOCK_DARK_BRICK_WALL); - addBlock(CASTLE_BLOCK_DARK_BRICK_CRACKED); - addBlock(CASTLE_BLOCK_DARK_BRICK_BLOODY); + addBlock(DARK_STONE); + addBlock(DARK_STONE_STAIRS); + addBlock(DARK_STONE_SLAB); + addBlock(DARK_STONE_WALL); + addBlock(INFESTED_DARK_STONE); + addBlock(DARK_STONE_BRICKS); + addBlock(DARK_STONE_BRICK_STAIRS); + addBlock(DARK_STONE_BRICK_SLAB); + addBlock(DARK_STONE_BRICK_WALL); + addBlock(CRACKED_DARK_STONE_BRICKS); + addBlock(CHISELED_DARK_STONE_BRICKS); + addBlock(BLOODY_DARK_STONE_BRICKS); + addBlock(COBBLED_DARK_STONE); + addBlock(COBBLED_DARK_STONE_STAIRS); + addBlock(COBBLED_DARK_STONE_SLAB); + addBlock(COBBLED_DARK_STONE_WALL); + addBlock(POLISHED_DARK_STONE); + addBlock(POLISHED_DARK_STONE_STAIRS); + addBlock(POLISHED_DARK_STONE_SLAB); + addBlock(POLISHED_DARK_STONE_WALL); + addBlock(DARK_STONE_TILES); + addBlock(DARK_STONE_TILES_STAIRS); + addBlock(DARK_STONE_TILES_SLAB); + addBlock(DARK_STONE_TILES_WALL); + addBlock(CRACKED_DARK_STONE_TILES); addBlock(CASTLE_BLOCK_PURPLE_BRICK); addBlock(CASTLE_STAIRS_PURPLE_BRICK); addBlock(CASTLE_SLAB_PURPLE_BRICK); addBlock(CASTLE_BLOCK_PURPLE_BRICK_WALL); - addBlock(CASTLE_BLOCK_NORMAL_BRICK); } private void addDecorativeBlocks() { diff --git a/src/main/java/de/teamlapen/vampirism/modcompat/guide/GuideBook.java b/src/main/java/de/teamlapen/vampirism/modcompat/guide/GuideBook.java index e75abd0afc..256ae0f36a 100755 --- a/src/main/java/de/teamlapen/vampirism/modcompat/guide/GuideBook.java +++ b/src/main/java/de/teamlapen/vampirism/modcompat/guide/GuideBook.java @@ -79,7 +79,7 @@ static void buildCategories(@NotNull List categories) { categories.add(new CategoryItemStack(buildCreatures(helper), translateComponent("guide.vampirism.entity.title"), new ItemStack(Items.ZOMBIE_HEAD))); categories.add(new CategoryItemStack(buildWorld(helper), translateComponent("guide.vampirism.world.title"), new ItemStack(ModBlocks.CURSED_EARTH.get()))); categories.add(new CategoryItemStack(buildItems(helper), translateComponent("guide.vampirism.items.title"), new ItemStack(Items.APPLE))); - categories.add(new CategoryItemStack(buildBlocks(helper), translateComponent("guide.vampirism.blocks.title"), new ItemStack(ModBlocks.CASTLE_BLOCK_DARK_BRICK.get()))); + categories.add(new CategoryItemStack(buildBlocks(helper), translateComponent("guide.vampirism.blocks.title"), new ItemStack(ModBlocks.DARK_STONE_BRICKS.get()))); categories.add(new CategoryItemStack(buildChangelog(helper), translateComponent("guide.vampirism.changelog.title"), new ItemStack(Items.WRITABLE_BOOK))); MinecraftForge.EVENT_BUS.post(new VampirismGuideBookCategoriesEvent(categories)); helper.registerLinkablePages(categories); @@ -481,7 +481,7 @@ private static String loc(@NotNull Item i) { Map entries = new LinkedHashMap<>(); String base = "guide.vampirism.blocks."; //General - helper.info(ModBlocks.CASTLE_BLOCK_DARK_BRICK.get()).recipes("general/castle_block_dark_brick_0", "general/castle_block_dark_brick_1", "general/castle_block_dark_stone", "general/castle_block_normal_brick", "general/castle_block_purple_brick", "general/castle_slab_dark_brick", "general/castle_stairs_dark_brick").build(entries); + helper.info(ModBlocks.DARK_STONE_BRICKS.get()).recipes("general/castle_block_dark_brick_0", "general/castle_block_dark_brick_1", "general/castle_block_dark_stone", "general/castle_block_normal_brick", "general/castle_block_purple_brick", "general/castle_slab_dark_brick", "general/castle_stairs_dark_brick").build(entries); helper.info(ModBlocks.VAMPIRE_ORCHID.get()).build(entries); //Vampire helper.info(ModBlocks.BLOOD_CONTAINER.get()).recipes("vampire/blood_container").build(entries); diff --git a/src/main/java/de/teamlapen/vampirism/tests/Tests.java b/src/main/java/de/teamlapen/vampirism/tests/Tests.java index 1939c2ce93..40e1f8ca43 100644 --- a/src/main/java/de/teamlapen/vampirism/tests/Tests.java +++ b/src/main/java/de/teamlapen/vampirism/tests/Tests.java @@ -150,7 +150,7 @@ private static void clearArea(@NotNull Level world) { for (int x = -21; x < 22; x++) { for (int y = 1; y < 22; y++) { for (int z = -21; z < 22; z++) { - BlockState s = (y == 1 || x == -21 || x == 21 || z == -21 || z == 21 || y == 21) ? ModBlocks.CASTLE_BLOCK_DARK_STONE.get().defaultBlockState() : Blocks.AIR.defaultBlockState(); + BlockState s = (y == 1 || x == -21 || x == 21 || z == -21 || z == 21 || y == 21) ? ModBlocks.DARK_STONE.get().defaultBlockState() : Blocks.AIR.defaultBlockState(); world.setBlockAndUpdate(new BlockPos(x, y, z), s); } } diff --git a/src/main/java/de/teamlapen/vampirism/world/biome/VampirismBiomes.java b/src/main/java/de/teamlapen/vampirism/world/biome/VampirismBiomes.java index 26ee2e2906..b60b531586 100644 --- a/src/main/java/de/teamlapen/vampirism/world/biome/VampirismBiomes.java +++ b/src/main/java/de/teamlapen/vampirism/world/biome/VampirismBiomes.java @@ -73,8 +73,7 @@ public static void addVampireTrees(BiomeGenerationSettings.@NotNull Builder buil public static void addUndergroundVariety(BiomeGenerationSettings.@NotNull Builder builder) { builder.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, OrePlacements.ORE_GRAVEL); builder.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, VampirismFeatures.ORE_CURSED_DIRT_PLACED); - builder.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, VampirismFeatures.ORE_DARK_STONE_LOWER_PLACED); - builder.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, VampirismFeatures.ORE_DARK_STONE_UPPER_PLACED); + builder.addFeature(GenerationStep.Decoration.UNDERGROUND_DECORATION, VampirismFeatures.ORE_DARK_STONE_PLACED); } public static void addBushPatch(BiomeGenerationSettings.@NotNull Builder builder) { diff --git a/src/main/java/de/teamlapen/vampirism/world/gen/VampirismFeatures.java b/src/main/java/de/teamlapen/vampirism/world/gen/VampirismFeatures.java index 0e202d2011..0d80158a49 100644 --- a/src/main/java/de/teamlapen/vampirism/world/gen/VampirismFeatures.java +++ b/src/main/java/de/teamlapen/vampirism/world/gen/VampirismFeatures.java @@ -60,7 +60,6 @@ import java.util.OptionalInt; import static net.minecraft.data.worldgen.placement.OrePlacements.commonOrePlacement; -import static net.minecraft.data.worldgen.placement.OrePlacements.rareOrePlacement; public class VampirismFeatures { @@ -96,8 +95,7 @@ public class VampirismFeatures { public static final ResourceKey WATER_LAKE_PLACED = createPlacedKey("mod_lake_placed"); public static final ResourceKey VAMPIRE_TREES_PLACED = createPlacedKey("vampire_trees"); public static final ResourceKey FOREST_GRASS_PLACED = createPlacedKey("forest_grass"); - public static final ResourceKey ORE_DARK_STONE_UPPER_PLACED = createPlacedKey("ore_dark_stone_upper"); - public static final ResourceKey ORE_DARK_STONE_LOWER_PLACED = createPlacedKey("ore_dark_stone_lower"); + public static final ResourceKey ORE_DARK_STONE_PLACED = createPlacedKey("ore_dark_stone_lower"); public static final ResourceKey ORE_CURSED_DIRT_PLACED = createPlacedKey("ore_cursed_dirt"); public static final ResourceKey VAMPIRE_SPAWN = createModifierKey("spawn/vampire_spawns"); @@ -141,9 +139,9 @@ public static void createConfiguredFeatures(BootstapContext(Feature.TREE, new TreeConfiguration.TreeConfigurationBuilder(BlockStateProvider.simple(ModBlocks.DARK_SPRUCE_LOG.get()), new StraightTrunkPlacer(11, 2, 2), BlockStateProvider.simple(ModBlocks.DARK_SPRUCE_LEAVES.get().defaultBlockState()), new SpruceFoliagePlacer(UniformInt.of(2, 3), UniformInt.of(0, 2), UniformInt.of(3, 7)), new ThreeLayersFeatureSize(5, 8, 0, 3, 3, OptionalInt.of(5))).ignoreVines().build())); context.register(CURSED_SPRUCE_TREE, new ConfiguredFeature<>(Feature.TREE, new TreeConfiguration.TreeConfigurationBuilder(BlockStateProvider.simple(ModBlocks.CURSED_SPRUCE_LOG.get()), new StraightTrunkPlacer(11, 2, 2), BlockStateProvider.simple(ModBlocks.DARK_SPRUCE_LEAVES.get().defaultBlockState()), new SpruceFoliagePlacer(UniformInt.of(2, 3), UniformInt.of(0, 2), UniformInt.of(3, 7)), new ThreeLayersFeatureSize(5, 8, 0, 3, 3, OptionalInt.of(5))).decorators(ImmutableList.of(TrunkCursedVineDecorator.INSTANCE)).ignoreVines().build())); context.register(VAMPIRE_DUNGEON, new ConfiguredFeature<>(ModFeatures.VAMPIRE_DUNGEON.get(), FeatureConfiguration.NONE)); - context.register(WATER_LAKE, new ConfiguredFeature<>(Feature.LAKE, new LakeFeature.Configuration(BlockStateProvider.simple(Blocks.WATER), BlockStateProvider.simple(ModBlocks.CASTLE_BLOCK_DARK_STONE.get())))); + context.register(WATER_LAKE, new ConfiguredFeature<>(Feature.LAKE, new LakeFeature.Configuration(BlockStateProvider.simple(Blocks.WATER), BlockStateProvider.simple(ModBlocks.DARK_STONE.get())))); context.register(VAMPIRE_TREES, new ConfiguredFeature<>(Feature.RANDOM_SELECTOR, new RandomFeatureConfiguration(List.of(new WeightedPlacedFeature(placedFeatures.getOrThrow(CURSED_SPRUCE_TREE_PLACED), 0.3f)), placedFeatures.getOrThrow(DARK_SPRUCE_TREE_PLACED)))); - context.register(ORE_DARK_STONE, new ConfiguredFeature<>(Feature.ORE, new OreConfiguration(new TagMatchTest(BlockTags.BASE_STONE_OVERWORLD), ModBlocks.CASTLE_BLOCK_DARK_STONE.get().defaultBlockState(), 64))); + context.register(ORE_DARK_STONE, new ConfiguredFeature<>(Feature.ORE, new OreConfiguration(new TagMatchTest(BlockTags.BASE_STONE_OVERWORLD), ModBlocks.DARK_STONE.get().defaultBlockState(), 64))); context.register(ORE_CURSED_DIRT, new ConfiguredFeature<>(Feature.ORE, new OreConfiguration(new TagMatchTest(BlockTags.BASE_STONE_OVERWORLD), ModBlocks.CURSED_EARTH.get().defaultBlockState(), 33))); } @@ -157,8 +155,7 @@ public static void createPlacedFeatures(BootstapContext context) context.register(WATER_LAKE_PLACED, new PlacedFeature(placedFeatures.getOrThrow(WATER_LAKE), List.of(RarityFilter.onAverageOnceEvery(200), InSquarePlacement.spread(), PlacementUtils.HEIGHTMAP_WORLD_SURFACE, BiomeFilter.biome()))); context.register(VAMPIRE_TREES_PLACED, new PlacedFeature(placedFeatures.getOrThrow(VAMPIRE_TREES), VegetationPlacements.treePlacement(PlacementUtils.countExtra(10, 0.1f, 1)))); context.register(FOREST_GRASS_PLACED, new PlacedFeature(placedFeatures.getOrThrow(VegetationFeatures.PATCH_GRASS), VegetationPlacements.worldSurfaceSquaredWithCount(2))); - context.register(ORE_DARK_STONE_UPPER_PLACED, new PlacedFeature(placedFeatures.getOrThrow(ORE_DARK_STONE), rareOrePlacement(6, HeightRangePlacement.uniform(VerticalAnchor.absolute(64), VerticalAnchor.absolute(128))))); - context.register(ORE_DARK_STONE_LOWER_PLACED, new PlacedFeature(placedFeatures.getOrThrow(ORE_DARK_STONE), commonOrePlacement(2, HeightRangePlacement.uniform(VerticalAnchor.absolute(0), VerticalAnchor.absolute(60))))); + context.register(ORE_DARK_STONE_PLACED, new PlacedFeature(placedFeatures.getOrThrow(ORE_DARK_STONE), commonOrePlacement(30, HeightRangePlacement.uniform(VerticalAnchor.bottom(), VerticalAnchor.top())))); context.register(ORE_CURSED_DIRT_PLACED, new PlacedFeature(placedFeatures.getOrThrow(ORE_CURSED_DIRT), commonOrePlacement(7, HeightRangePlacement.uniform(VerticalAnchor.absolute(0), VerticalAnchor.absolute(160))))); } diff --git a/src/main/java/de/teamlapen/vampirism/world/gen/feature/VampireDungeonFeature.java b/src/main/java/de/teamlapen/vampirism/world/gen/feature/VampireDungeonFeature.java index a324fc6f4a..2600d291ad 100644 --- a/src/main/java/de/teamlapen/vampirism/world/gen/feature/VampireDungeonFeature.java +++ b/src/main/java/de/teamlapen/vampirism/world/gen/feature/VampireDungeonFeature.java @@ -39,7 +39,7 @@ public VampireDungeonFeature(@NotNull Codec featureCon * TODO 1.20 recheck * copied from {@link MonsterRoomFeature#pldddddace(FeaturePlaceContext)} *

- * - changed {@link Blocks#MOSSY_COBBLESTONE} to {@link ModBlocks#CASTLE_BLOCK_DARK_BRICK} and {@link ModBlocks#CASTLE_BLOCK_DARK_BRICK_BLOODY} + * - changed {@link Blocks#MOSSY_COBBLESTONE} to {@link ModBlocks#DARK_STONE_BRICKS} and {@link ModBlocks#BLOODY_DARK_STONE_BRICKS} * - changed {@link Blocks#COBBLESTONE} to {@link Blocks#SPRUCE_PLANKS} * - changed {@link net.minecraft.world.level.storage.loot.BuiltInLootTables#SIMPLE_DUNGEON} to {@link ModLootTables#CHEST_VAMPIRE_DUNGEON} * - changed {@link MonsterRoomFeature#randomEntityId(net.minecraft.util.RandomSource)} to {@link ModEntities#VAMPIRE} @@ -96,7 +96,7 @@ public boolean place(@NotNull FeaturePlaceContext p_16 worldgenlevel.setBlock(blockpos2, CAVE_AIR, 2); } else if (blockstate.isSolid() && !blockstate.is(Blocks.CHEST)) { if (i4 == -1 && randomsource.nextInt(4) != 0) { - this.safeSetBlock(worldgenlevel, blockpos2, (p_160066_.random().nextInt(20) == 0 ? ModBlocks.CASTLE_BLOCK_DARK_BRICK_BLOODY.get() : ModBlocks.CASTLE_BLOCK_DARK_BRICK.get()).defaultBlockState(), predicate); + this.safeSetBlock(worldgenlevel, blockpos2, (p_160066_.random().nextInt(20) == 0 ? ModBlocks.BLOODY_DARK_STONE_BRICKS.get() : ModBlocks.DARK_STONE_BRICKS.get()).defaultBlockState(), predicate); } else { this.safeSetBlock(worldgenlevel, blockpos2, Blocks.SPRUCE_PLANKS.defaultBlockState(), predicate); } diff --git a/src/main/java/de/teamlapen/vampirism/world/gen/structure/vampirealtar/VampireAltarPieces.java b/src/main/java/de/teamlapen/vampirism/world/gen/structure/vampirealtar/VampireAltarPieces.java index 9ff50d55c5..45805d4c8c 100644 --- a/src/main/java/de/teamlapen/vampirism/world/gen/structure/vampirealtar/VampireAltarPieces.java +++ b/src/main/java/de/teamlapen/vampirism/world/gen/structure/vampirealtar/VampireAltarPieces.java @@ -55,7 +55,7 @@ public VampireAltarPiece(StructureTemplateManager pStructureTemplateManager, Com protected void handleDataMarker(@NotNull String pName, @NotNull BlockPos pPos, @NotNull ServerLevelAccessor pLevel, @NotNull RandomSource pRandom, @NotNull BoundingBox pBox) { switch (pName) { case "chest" -> { - pLevel.setBlock(pPos, ModBlocks.CASTLE_BLOCK_DARK_BRICK.get().defaultBlockState(), 3); + pLevel.setBlock(pPos, ModBlocks.DARK_STONE_BRICKS.get().defaultBlockState(), 3); BlockEntity blockEntity = pLevel.getBlockEntity(pPos.below()); if (blockEntity instanceof ChestBlockEntity chest) { chest.setLootTable(ModLootTables.CHEST_VAMPIRE_ALTAR, pRandom.nextLong()); diff --git a/src/main/resources/assets/vampirism/lang/en_us.json b/src/main/resources/assets/vampirism/lang/en_us.json index c9fc73e352..750fe8b41f 100644 --- a/src/main/resources/assets/vampirism/lang/en_us.json +++ b/src/main/resources/assets/vampirism/lang/en_us.json @@ -619,7 +619,6 @@ "block.vampirism.castle_block_normal_brick": "Stone Brick", "block.vampirism.castle_block_dark_brick": "Dark Stone Brick", "block.vampirism.castle_block_purple_brick": "Purple Stone Brick", - "block.vampirism.castle_block_dark_brick_bloody": "Bloody Dark Stone Brick", "block.vampirism.castle_stairs_dark_brick": "Dark Brick Stairs", "block.vampirism.castle_stairs_purple_brick": "Purple Brick Stairs", "block.vampirism.castle_stairs_dark_stone": "Dark Stone Stairs", @@ -733,9 +732,33 @@ "block.vampirism.dark_spruce_hanging_sign": "Dark Spruce Hanging Sign", "block.vampirism.cursed_spruce_hanging_sign": "Cursed Spruce Hanging Sign", "block.vampirism.cursed_earth_path": "Cursed Earth Path", - "block.vampirism.castle_block_dark_brick_cracked": "Cracked Dark Stone Brick", "block.vampirism.castle_block_dark_brick_wall": "Dark Brick Wall", "block.vampirism.castle_block_purple_brick_wall": "Purple Brick Wall", + "block.vampirism.dark_stone": "Dark Stone", + "block.vampirism.dark_stone_slab": "Dark Stone Slab", + "block.vampirism.dark_stone_stairs": "Dark Stone Stairs", + "block.vampirism.dark_stone_wall": "Dark Stone Wall", + "block.vampirism.dark_stone_bricks": "Dark Stone Bricks", + "block.vampirism.dark_stone_brick_slab": "Dark Stone Brick Slab", + "block.vampirism.dark_stone_brick_stairs": "Dark Stone Brick Stairs", + "block.vampirism.dark_stone_brick_wall": "Dark Stone Brick Wall", + "block.vampirism.cobbled_dark_stone": "Cobbled Dark Stone", + "block.vampirism.cobbled_dark_stone_slab": "Cobbled Dark Stone Slab", + "block.vampirism.cobbled_dark_stone_stairs": "Cobbled Dark Stone Stairs", + "block.vampirism.cobbled_dark_stone_wall": "Cobbled Dark Stone Wall", + "block.vampirism.polished_dark_stone": "Polished Dark Stone", + "block.vampirism.polished_dark_stone_slab": "Polished Dark Stone Slab", + "block.vampirism.polished_dark_stone_stairs": "Polished Dark Stone Stairs", + "block.vampirism.polished_dark_stone_wall": "Polished Dark Stone Wall", + "block.vampirism.dark_stone_tiles": "Dark Stone Tiles", + "block.vampirism.dark_stone_tiles_slab": "Dark Stone Tiles Slab", + "block.vampirism.dark_stone_tiles_stairs": "Dark Stone Tiles Stairs", + "block.vampirism.dark_stone_tiles_wall": "Dark Stone Tiles Wall", + "block.vampirism.cracked_dark_stone_tiles": "Cracked Dark Stone Tiles", + "block.vampirism.chiseled_dark_stone_bricks": "Chiseled Dark Stone Bricks", + "block.vampirism.infested_dark_stone": "Infested Dark Stone", + "block.vampirism.bloody_dark_stone_bricks": "Bloody Dark Stone Brick", + "block.vampirism.cracked_dark_stone_bricks": "Cracked Dark Stone Bricks", "__comment": "items", "item.vampirism.hunter_intel": "Hunter Intel", "item.vampirism.pure_blood": "Pure Blood", diff --git a/src/main/resources/assets/vampirism/textures/block/castle_block_dark_brick_cracked.png b/src/main/resources/assets/vampirism/textures/block/bloody_dark_stone_bricks.png similarity index 64% rename from src/main/resources/assets/vampirism/textures/block/castle_block_dark_brick_cracked.png rename to src/main/resources/assets/vampirism/textures/block/bloody_dark_stone_bricks.png index 9b6279c6d9..0ec9c7b8b4 100644 Binary files a/src/main/resources/assets/vampirism/textures/block/castle_block_dark_brick_cracked.png and b/src/main/resources/assets/vampirism/textures/block/bloody_dark_stone_bricks.png differ diff --git a/src/main/resources/assets/vampirism/textures/block/castle_block_dark_brick.png b/src/main/resources/assets/vampirism/textures/block/castle_block_dark_brick.png deleted file mode 100644 index 229d02b6a4..0000000000 Binary files a/src/main/resources/assets/vampirism/textures/block/castle_block_dark_brick.png and /dev/null differ diff --git a/src/main/resources/assets/vampirism/textures/block/castle_block_dark_brick_bloody.png b/src/main/resources/assets/vampirism/textures/block/castle_block_dark_brick_bloody.png deleted file mode 100644 index d205433370..0000000000 Binary files a/src/main/resources/assets/vampirism/textures/block/castle_block_dark_brick_bloody.png and /dev/null differ diff --git a/src/main/resources/assets/vampirism/textures/block/castle_block_dark_slab.png b/src/main/resources/assets/vampirism/textures/block/castle_block_dark_slab.png deleted file mode 100644 index c7b0a6cfe8..0000000000 Binary files a/src/main/resources/assets/vampirism/textures/block/castle_block_dark_slab.png and /dev/null differ diff --git a/src/main/resources/assets/vampirism/textures/block/castle_block_dark_stone.png b/src/main/resources/assets/vampirism/textures/block/castle_block_dark_stone.png deleted file mode 100644 index 59ed1d2193..0000000000 Binary files a/src/main/resources/assets/vampirism/textures/block/castle_block_dark_stone.png and /dev/null differ diff --git a/src/main/resources/assets/vampirism/textures/block/chiseled_dark_stone_bricks.png b/src/main/resources/assets/vampirism/textures/block/chiseled_dark_stone_bricks.png new file mode 100755 index 0000000000..3ba392d167 Binary files /dev/null and b/src/main/resources/assets/vampirism/textures/block/chiseled_dark_stone_bricks.png differ diff --git a/src/main/resources/assets/vampirism/textures/block/cobbled_dark_stone.png b/src/main/resources/assets/vampirism/textures/block/cobbled_dark_stone.png new file mode 100755 index 0000000000..ea82a708fc Binary files /dev/null and b/src/main/resources/assets/vampirism/textures/block/cobbled_dark_stone.png differ diff --git a/src/main/resources/assets/vampirism/textures/block/cracked_dark_stone_bricks.png b/src/main/resources/assets/vampirism/textures/block/cracked_dark_stone_bricks.png new file mode 100644 index 0000000000..5af5c97122 Binary files /dev/null and b/src/main/resources/assets/vampirism/textures/block/cracked_dark_stone_bricks.png differ diff --git a/src/main/resources/assets/vampirism/textures/block/cracked_dark_stone_tiles.png b/src/main/resources/assets/vampirism/textures/block/cracked_dark_stone_tiles.png new file mode 100644 index 0000000000..b7707452df Binary files /dev/null and b/src/main/resources/assets/vampirism/textures/block/cracked_dark_stone_tiles.png differ diff --git a/src/main/resources/assets/vampirism/textures/block/dark_stone.png b/src/main/resources/assets/vampirism/textures/block/dark_stone.png new file mode 100755 index 0000000000..f9c491c935 Binary files /dev/null and b/src/main/resources/assets/vampirism/textures/block/dark_stone.png differ diff --git a/src/main/resources/assets/vampirism/textures/block/dark_stone_bricks.png b/src/main/resources/assets/vampirism/textures/block/dark_stone_bricks.png new file mode 100755 index 0000000000..9648c74d8c Binary files /dev/null and b/src/main/resources/assets/vampirism/textures/block/dark_stone_bricks.png differ diff --git a/src/main/resources/assets/vampirism/textures/block/dark_stone_tiles.png b/src/main/resources/assets/vampirism/textures/block/dark_stone_tiles.png new file mode 100755 index 0000000000..1566e689b0 Binary files /dev/null and b/src/main/resources/assets/vampirism/textures/block/dark_stone_tiles.png differ diff --git a/src/main/resources/assets/vampirism/textures/block/polished_dark_stone.png b/src/main/resources/assets/vampirism/textures/block/polished_dark_stone.png new file mode 100755 index 0000000000..3f2ed194c5 Binary files /dev/null and b/src/main/resources/assets/vampirism/textures/block/polished_dark_stone.png differ diff --git a/src/main/resources/data/vampirism/structures/altar_big.nbt b/src/main/resources/data/vampirism/structures/altar_big.nbt index b866fe719f..032ea7f069 100644 Binary files a/src/main/resources/data/vampirism/structures/altar_big.nbt and b/src/main/resources/data/vampirism/structures/altar_big.nbt differ diff --git a/src/main/resources/data/vampirism/structures/altar_big_old.nbt b/src/main/resources/data/vampirism/structures/altar_big_old.nbt index 37974bd91f..83f248d9a2 100644 Binary files a/src/main/resources/data/vampirism/structures/altar_big_old.nbt and b/src/main/resources/data/vampirism/structures/altar_big_old.nbt differ diff --git a/src/main/resources/data/vampirism/structures/altar_small.nbt b/src/main/resources/data/vampirism/structures/altar_small.nbt index 6b0a9ad948..c9e110d9af 100644 Binary files a/src/main/resources/data/vampirism/structures/altar_small.nbt and b/src/main/resources/data/vampirism/structures/altar_small.nbt differ diff --git a/src/main/resources/data/vampirism/structures/altar_small_old.nbt b/src/main/resources/data/vampirism/structures/altar_small_old.nbt index 317dd939a9..04298f9516 100644 Binary files a/src/main/resources/data/vampirism/structures/altar_small_old.nbt and b/src/main/resources/data/vampirism/structures/altar_small_old.nbt differ diff --git a/src/main/resources/data/vampirism/structures/vampire_hut.nbt b/src/main/resources/data/vampirism/structures/vampire_hut.nbt index 7d82b48485..d2a5f14194 100644 Binary files a/src/main/resources/data/vampirism/structures/vampire_hut.nbt and b/src/main/resources/data/vampirism/structures/vampire_hut.nbt differ