diff --git a/CHANGELOG b/CHANGELOG index b2e2274..1379308 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -53,6 +53,7 @@ This version focuses on QOL and bug fixes ### Changelog 0.3 -> 0.4 * Concrete improvements * 3 new colours - basic, dark green and orange + * Concrete with bars can now be placed horizontally * Bug fixes (see below) * Added 3(?) new banner patterns * Sickle @@ -60,10 +61,14 @@ This version focuses on QOL and bug fixes * Grain(?) * Added a new antenna item to improve radio electronics recipes * Changed textures for dirt road, green-white tiles and TV white noise +* Parquet re-structuring + * Separated oak and dark oak parquet in naming + * Added spruce parquet (TODO) * Bug fixes * Fixed a few missing drops/tags/recipes related to concrete * Concrete with bars is now pickaxe mine-able - * Some concrete blocks now have drops + * Fixed some concrete blocks missing drops * Cracked concrete now has a dyeing category * Technical changes - * Minor asset location/name changes - e.g. concrete with bars models moved to separate folder \ No newline at end of file + * Minor asset location/name changes - e.g. concrete with bars models moved to separate folder + * Moved to newer Fabric versions \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/blockstates/separated_oak_parquet.json b/src/main/generated/assets/new_soviet/blockstates/separated_oak_parquet.json new file mode 100644 index 0000000..e450eec --- /dev/null +++ b/src/main/generated/assets/new_soviet/blockstates/separated_oak_parquet.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/separated_oak_parquet" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/blockstates/separated_oak_parquet_slab.json b/src/main/generated/assets/new_soviet/blockstates/separated_oak_parquet_slab.json new file mode 100644 index 0000000..6bfa98e --- /dev/null +++ b/src/main/generated/assets/new_soviet/blockstates/separated_oak_parquet_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "new_soviet:block/separated_oak_parquet_slab" + }, + "type=double": { + "model": "new_soviet:block/separated_oak_parquet" + }, + "type=top": { + "model": "new_soviet:block/separated_oak_parquet_slab_top" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/blockstates/separated_parquet_stairs.json b/src/main/generated/assets/new_soviet/blockstates/separated_oak_parquet_stairs.json similarity index 57% rename from src/main/generated/assets/new_soviet/blockstates/separated_parquet_stairs.json rename to src/main/generated/assets/new_soviet/blockstates/separated_oak_parquet_stairs.json index eafbd13..8044251 100644 --- a/src/main/generated/assets/new_soviet/blockstates/separated_parquet_stairs.json +++ b/src/main/generated/assets/new_soviet/blockstates/separated_oak_parquet_stairs.json @@ -1,206 +1,206 @@ { "variants": { "facing=east,half=bottom,shape=inner_left": { - "model": "new_soviet:block/separated_parquet_stairs_inner", + "model": "new_soviet:block/separated_oak_parquet_stairs_inner", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=inner_right": { - "model": "new_soviet:block/separated_parquet_stairs_inner" + "model": "new_soviet:block/separated_oak_parquet_stairs_inner" }, "facing=east,half=bottom,shape=outer_left": { - "model": "new_soviet:block/separated_parquet_stairs_outer", + "model": "new_soviet:block/separated_oak_parquet_stairs_outer", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=outer_right": { - "model": "new_soviet:block/separated_parquet_stairs_outer" + "model": "new_soviet:block/separated_oak_parquet_stairs_outer" }, "facing=east,half=bottom,shape=straight": { - "model": "new_soviet:block/separated_parquet_stairs" + "model": "new_soviet:block/separated_oak_parquet_stairs" }, "facing=east,half=top,shape=inner_left": { - "model": "new_soviet:block/separated_parquet_stairs_inner", + "model": "new_soviet:block/separated_oak_parquet_stairs_inner", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=inner_right": { - "model": "new_soviet:block/separated_parquet_stairs_inner", + "model": "new_soviet:block/separated_oak_parquet_stairs_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=outer_left": { - "model": "new_soviet:block/separated_parquet_stairs_outer", + "model": "new_soviet:block/separated_oak_parquet_stairs_outer", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=outer_right": { - "model": "new_soviet:block/separated_parquet_stairs_outer", + "model": "new_soviet:block/separated_oak_parquet_stairs_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=straight": { - "model": "new_soviet:block/separated_parquet_stairs", + "model": "new_soviet:block/separated_oak_parquet_stairs", "uvlock": true, "x": 180 }, "facing=north,half=bottom,shape=inner_left": { - "model": "new_soviet:block/separated_parquet_stairs_inner", + "model": "new_soviet:block/separated_oak_parquet_stairs_inner", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=inner_right": { - "model": "new_soviet:block/separated_parquet_stairs_inner", + "model": "new_soviet:block/separated_oak_parquet_stairs_inner", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=outer_left": { - "model": "new_soviet:block/separated_parquet_stairs_outer", + "model": "new_soviet:block/separated_oak_parquet_stairs_outer", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=outer_right": { - "model": "new_soviet:block/separated_parquet_stairs_outer", + "model": "new_soviet:block/separated_oak_parquet_stairs_outer", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=straight": { - "model": "new_soviet:block/separated_parquet_stairs", + "model": "new_soviet:block/separated_oak_parquet_stairs", "uvlock": true, "y": 270 }, "facing=north,half=top,shape=inner_left": { - "model": "new_soviet:block/separated_parquet_stairs_inner", + "model": "new_soviet:block/separated_oak_parquet_stairs_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=inner_right": { - "model": "new_soviet:block/separated_parquet_stairs_inner", + "model": "new_soviet:block/separated_oak_parquet_stairs_inner", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=outer_left": { - "model": "new_soviet:block/separated_parquet_stairs_outer", + "model": "new_soviet:block/separated_oak_parquet_stairs_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=outer_right": { - "model": "new_soviet:block/separated_parquet_stairs_outer", + "model": "new_soviet:block/separated_oak_parquet_stairs_outer", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=straight": { - "model": "new_soviet:block/separated_parquet_stairs", + "model": "new_soviet:block/separated_oak_parquet_stairs", "uvlock": true, "x": 180, "y": 270 }, "facing=south,half=bottom,shape=inner_left": { - "model": "new_soviet:block/separated_parquet_stairs_inner" + "model": "new_soviet:block/separated_oak_parquet_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { - "model": "new_soviet:block/separated_parquet_stairs_inner", + "model": "new_soviet:block/separated_oak_parquet_stairs_inner", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=outer_left": { - "model": "new_soviet:block/separated_parquet_stairs_outer" + "model": "new_soviet:block/separated_oak_parquet_stairs_outer" }, "facing=south,half=bottom,shape=outer_right": { - "model": "new_soviet:block/separated_parquet_stairs_outer", + "model": "new_soviet:block/separated_oak_parquet_stairs_outer", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=straight": { - "model": "new_soviet:block/separated_parquet_stairs", + "model": "new_soviet:block/separated_oak_parquet_stairs", "uvlock": true, "y": 90 }, "facing=south,half=top,shape=inner_left": { - "model": "new_soviet:block/separated_parquet_stairs_inner", + "model": "new_soviet:block/separated_oak_parquet_stairs_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=inner_right": { - "model": "new_soviet:block/separated_parquet_stairs_inner", + "model": "new_soviet:block/separated_oak_parquet_stairs_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=outer_left": { - "model": "new_soviet:block/separated_parquet_stairs_outer", + "model": "new_soviet:block/separated_oak_parquet_stairs_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=outer_right": { - "model": "new_soviet:block/separated_parquet_stairs_outer", + "model": "new_soviet:block/separated_oak_parquet_stairs_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=straight": { - "model": "new_soviet:block/separated_parquet_stairs", + "model": "new_soviet:block/separated_oak_parquet_stairs", "uvlock": true, "x": 180, "y": 90 }, "facing=west,half=bottom,shape=inner_left": { - "model": "new_soviet:block/separated_parquet_stairs_inner", + "model": "new_soviet:block/separated_oak_parquet_stairs_inner", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=inner_right": { - "model": "new_soviet:block/separated_parquet_stairs_inner", + "model": "new_soviet:block/separated_oak_parquet_stairs_inner", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=outer_left": { - "model": "new_soviet:block/separated_parquet_stairs_outer", + "model": "new_soviet:block/separated_oak_parquet_stairs_outer", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=outer_right": { - "model": "new_soviet:block/separated_parquet_stairs_outer", + "model": "new_soviet:block/separated_oak_parquet_stairs_outer", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=straight": { - "model": "new_soviet:block/separated_parquet_stairs", + "model": "new_soviet:block/separated_oak_parquet_stairs", "uvlock": true, "y": 180 }, "facing=west,half=top,shape=inner_left": { - "model": "new_soviet:block/separated_parquet_stairs_inner", + "model": "new_soviet:block/separated_oak_parquet_stairs_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=inner_right": { - "model": "new_soviet:block/separated_parquet_stairs_inner", + "model": "new_soviet:block/separated_oak_parquet_stairs_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=outer_left": { - "model": "new_soviet:block/separated_parquet_stairs_outer", + "model": "new_soviet:block/separated_oak_parquet_stairs_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=outer_right": { - "model": "new_soviet:block/separated_parquet_stairs_outer", + "model": "new_soviet:block/separated_oak_parquet_stairs_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=straight": { - "model": "new_soviet:block/separated_parquet_stairs", + "model": "new_soviet:block/separated_oak_parquet_stairs", "uvlock": true, "x": 180, "y": 180 diff --git a/src/main/generated/assets/new_soviet/blockstates/separated_parquet.json b/src/main/generated/assets/new_soviet/blockstates/separated_parquet.json deleted file mode 100644 index f55b78b..0000000 --- a/src/main/generated/assets/new_soviet/blockstates/separated_parquet.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "new_soviet:block/separated_parquet" - } - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/blockstates/separated_parquet_slab.json b/src/main/generated/assets/new_soviet/blockstates/separated_parquet_slab.json deleted file mode 100644 index e5b2be9..0000000 --- a/src/main/generated/assets/new_soviet/blockstates/separated_parquet_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "new_soviet:block/separated_parquet_slab" - }, - "type=double": { - "model": "new_soviet:block/separated_parquet" - }, - "type=top": { - "model": "new_soviet:block/separated_parquet_slab_top" - } - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/blockstates/straight_oak_parquet.json b/src/main/generated/assets/new_soviet/blockstates/straight_oak_parquet.json new file mode 100644 index 0000000..f479dd4 --- /dev/null +++ b/src/main/generated/assets/new_soviet/blockstates/straight_oak_parquet.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/straight_oak_parquet" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/blockstates/straight_oak_parquet_slab.json b/src/main/generated/assets/new_soviet/blockstates/straight_oak_parquet_slab.json new file mode 100644 index 0000000..89ad9ca --- /dev/null +++ b/src/main/generated/assets/new_soviet/blockstates/straight_oak_parquet_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "new_soviet:block/straight_oak_parquet_slab" + }, + "type=double": { + "model": "new_soviet:block/straight_oak_parquet" + }, + "type=top": { + "model": "new_soviet:block/straight_oak_parquet_slab_top" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/blockstates/straight_parquet_stairs.json b/src/main/generated/assets/new_soviet/blockstates/straight_oak_parquet_stairs.json similarity index 58% rename from src/main/generated/assets/new_soviet/blockstates/straight_parquet_stairs.json rename to src/main/generated/assets/new_soviet/blockstates/straight_oak_parquet_stairs.json index fc732b4..8f5b767 100644 --- a/src/main/generated/assets/new_soviet/blockstates/straight_parquet_stairs.json +++ b/src/main/generated/assets/new_soviet/blockstates/straight_oak_parquet_stairs.json @@ -1,206 +1,206 @@ { "variants": { "facing=east,half=bottom,shape=inner_left": { - "model": "new_soviet:block/straight_parquet_stairs_inner", + "model": "new_soviet:block/straight_oak_parquet_stairs_inner", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=inner_right": { - "model": "new_soviet:block/straight_parquet_stairs_inner" + "model": "new_soviet:block/straight_oak_parquet_stairs_inner" }, "facing=east,half=bottom,shape=outer_left": { - "model": "new_soviet:block/straight_parquet_stairs_outer", + "model": "new_soviet:block/straight_oak_parquet_stairs_outer", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=outer_right": { - "model": "new_soviet:block/straight_parquet_stairs_outer" + "model": "new_soviet:block/straight_oak_parquet_stairs_outer" }, "facing=east,half=bottom,shape=straight": { - "model": "new_soviet:block/straight_parquet_stairs" + "model": "new_soviet:block/straight_oak_parquet_stairs" }, "facing=east,half=top,shape=inner_left": { - "model": "new_soviet:block/straight_parquet_stairs_inner", + "model": "new_soviet:block/straight_oak_parquet_stairs_inner", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=inner_right": { - "model": "new_soviet:block/straight_parquet_stairs_inner", + "model": "new_soviet:block/straight_oak_parquet_stairs_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=outer_left": { - "model": "new_soviet:block/straight_parquet_stairs_outer", + "model": "new_soviet:block/straight_oak_parquet_stairs_outer", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=outer_right": { - "model": "new_soviet:block/straight_parquet_stairs_outer", + "model": "new_soviet:block/straight_oak_parquet_stairs_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=straight": { - "model": "new_soviet:block/straight_parquet_stairs", + "model": "new_soviet:block/straight_oak_parquet_stairs", "uvlock": true, "x": 180 }, "facing=north,half=bottom,shape=inner_left": { - "model": "new_soviet:block/straight_parquet_stairs_inner", + "model": "new_soviet:block/straight_oak_parquet_stairs_inner", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=inner_right": { - "model": "new_soviet:block/straight_parquet_stairs_inner", + "model": "new_soviet:block/straight_oak_parquet_stairs_inner", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=outer_left": { - "model": "new_soviet:block/straight_parquet_stairs_outer", + "model": "new_soviet:block/straight_oak_parquet_stairs_outer", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=outer_right": { - "model": "new_soviet:block/straight_parquet_stairs_outer", + "model": "new_soviet:block/straight_oak_parquet_stairs_outer", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=straight": { - "model": "new_soviet:block/straight_parquet_stairs", + "model": "new_soviet:block/straight_oak_parquet_stairs", "uvlock": true, "y": 270 }, "facing=north,half=top,shape=inner_left": { - "model": "new_soviet:block/straight_parquet_stairs_inner", + "model": "new_soviet:block/straight_oak_parquet_stairs_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=inner_right": { - "model": "new_soviet:block/straight_parquet_stairs_inner", + "model": "new_soviet:block/straight_oak_parquet_stairs_inner", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=outer_left": { - "model": "new_soviet:block/straight_parquet_stairs_outer", + "model": "new_soviet:block/straight_oak_parquet_stairs_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=outer_right": { - "model": "new_soviet:block/straight_parquet_stairs_outer", + "model": "new_soviet:block/straight_oak_parquet_stairs_outer", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=straight": { - "model": "new_soviet:block/straight_parquet_stairs", + "model": "new_soviet:block/straight_oak_parquet_stairs", "uvlock": true, "x": 180, "y": 270 }, "facing=south,half=bottom,shape=inner_left": { - "model": "new_soviet:block/straight_parquet_stairs_inner" + "model": "new_soviet:block/straight_oak_parquet_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { - "model": "new_soviet:block/straight_parquet_stairs_inner", + "model": "new_soviet:block/straight_oak_parquet_stairs_inner", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=outer_left": { - "model": "new_soviet:block/straight_parquet_stairs_outer" + "model": "new_soviet:block/straight_oak_parquet_stairs_outer" }, "facing=south,half=bottom,shape=outer_right": { - "model": "new_soviet:block/straight_parquet_stairs_outer", + "model": "new_soviet:block/straight_oak_parquet_stairs_outer", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=straight": { - "model": "new_soviet:block/straight_parquet_stairs", + "model": "new_soviet:block/straight_oak_parquet_stairs", "uvlock": true, "y": 90 }, "facing=south,half=top,shape=inner_left": { - "model": "new_soviet:block/straight_parquet_stairs_inner", + "model": "new_soviet:block/straight_oak_parquet_stairs_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=inner_right": { - "model": "new_soviet:block/straight_parquet_stairs_inner", + "model": "new_soviet:block/straight_oak_parquet_stairs_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=outer_left": { - "model": "new_soviet:block/straight_parquet_stairs_outer", + "model": "new_soviet:block/straight_oak_parquet_stairs_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=outer_right": { - "model": "new_soviet:block/straight_parquet_stairs_outer", + "model": "new_soviet:block/straight_oak_parquet_stairs_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=straight": { - "model": "new_soviet:block/straight_parquet_stairs", + "model": "new_soviet:block/straight_oak_parquet_stairs", "uvlock": true, "x": 180, "y": 90 }, "facing=west,half=bottom,shape=inner_left": { - "model": "new_soviet:block/straight_parquet_stairs_inner", + "model": "new_soviet:block/straight_oak_parquet_stairs_inner", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=inner_right": { - "model": "new_soviet:block/straight_parquet_stairs_inner", + "model": "new_soviet:block/straight_oak_parquet_stairs_inner", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=outer_left": { - "model": "new_soviet:block/straight_parquet_stairs_outer", + "model": "new_soviet:block/straight_oak_parquet_stairs_outer", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=outer_right": { - "model": "new_soviet:block/straight_parquet_stairs_outer", + "model": "new_soviet:block/straight_oak_parquet_stairs_outer", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=straight": { - "model": "new_soviet:block/straight_parquet_stairs", + "model": "new_soviet:block/straight_oak_parquet_stairs", "uvlock": true, "y": 180 }, "facing=west,half=top,shape=inner_left": { - "model": "new_soviet:block/straight_parquet_stairs_inner", + "model": "new_soviet:block/straight_oak_parquet_stairs_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=inner_right": { - "model": "new_soviet:block/straight_parquet_stairs_inner", + "model": "new_soviet:block/straight_oak_parquet_stairs_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=outer_left": { - "model": "new_soviet:block/straight_parquet_stairs_outer", + "model": "new_soviet:block/straight_oak_parquet_stairs_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=outer_right": { - "model": "new_soviet:block/straight_parquet_stairs_outer", + "model": "new_soviet:block/straight_oak_parquet_stairs_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=straight": { - "model": "new_soviet:block/straight_parquet_stairs", + "model": "new_soviet:block/straight_oak_parquet_stairs", "uvlock": true, "x": 180, "y": 180 diff --git a/src/main/generated/assets/new_soviet/blockstates/straight_parquet.json b/src/main/generated/assets/new_soviet/blockstates/straight_parquet.json deleted file mode 100644 index fd276ff..0000000 --- a/src/main/generated/assets/new_soviet/blockstates/straight_parquet.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "new_soviet:block/straight_parquet" - } - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/blockstates/straight_parquet_slab.json b/src/main/generated/assets/new_soviet/blockstates/straight_parquet_slab.json deleted file mode 100644 index 513e226..0000000 --- a/src/main/generated/assets/new_soviet/blockstates/straight_parquet_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "new_soviet:block/straight_parquet_slab" - }, - "type=double": { - "model": "new_soviet:block/straight_parquet" - }, - "type=top": { - "model": "new_soviet:block/straight_parquet_slab_top" - } - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/separated_oak_parquet.json b/src/main/generated/assets/new_soviet/models/block/separated_oak_parquet.json new file mode 100644 index 0000000..e106db1 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/separated_oak_parquet.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "new_soviet:block/floor/planks/separated_oak_parquet" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/separated_oak_parquet_slab.json b/src/main/generated/assets/new_soviet/models/block/separated_oak_parquet_slab.json new file mode 100644 index 0000000..8af5684 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/separated_oak_parquet_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "new_soviet:block/floor/planks/separated_oak_parquet", + "side": "new_soviet:block/floor/planks/separated_oak_parquet", + "top": "new_soviet:block/floor/planks/separated_oak_parquet" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/separated_oak_parquet_slab_top.json b/src/main/generated/assets/new_soviet/models/block/separated_oak_parquet_slab_top.json new file mode 100644 index 0000000..eec42c1 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/separated_oak_parquet_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "new_soviet:block/floor/planks/separated_oak_parquet", + "side": "new_soviet:block/floor/planks/separated_oak_parquet", + "top": "new_soviet:block/floor/planks/separated_oak_parquet" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/separated_oak_parquet_stairs.json b/src/main/generated/assets/new_soviet/models/block/separated_oak_parquet_stairs.json new file mode 100644 index 0000000..f6922c6 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/separated_oak_parquet_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "new_soviet:block/floor/planks/separated_oak_parquet", + "side": "new_soviet:block/floor/planks/separated_oak_parquet", + "top": "new_soviet:block/floor/planks/separated_oak_parquet" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/separated_oak_parquet_stairs_inner.json b/src/main/generated/assets/new_soviet/models/block/separated_oak_parquet_stairs_inner.json new file mode 100644 index 0000000..d1fe825 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/separated_oak_parquet_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "new_soviet:block/floor/planks/separated_oak_parquet", + "side": "new_soviet:block/floor/planks/separated_oak_parquet", + "top": "new_soviet:block/floor/planks/separated_oak_parquet" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/separated_oak_parquet_stairs_outer.json b/src/main/generated/assets/new_soviet/models/block/separated_oak_parquet_stairs_outer.json new file mode 100644 index 0000000..f92ba0f --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/separated_oak_parquet_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "new_soviet:block/floor/planks/separated_oak_parquet", + "side": "new_soviet:block/floor/planks/separated_oak_parquet", + "top": "new_soviet:block/floor/planks/separated_oak_parquet" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/separated_parquet.json b/src/main/generated/assets/new_soviet/models/block/separated_parquet.json deleted file mode 100644 index 377c80d..0000000 --- a/src/main/generated/assets/new_soviet/models/block/separated_parquet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/floor/planks/separated_parquet" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/separated_parquet_slab.json b/src/main/generated/assets/new_soviet/models/block/separated_parquet_slab.json deleted file mode 100644 index 60ccdb7..0000000 --- a/src/main/generated/assets/new_soviet/models/block/separated_parquet_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "new_soviet:block/floor/planks/separated_parquet", - "side": "new_soviet:block/floor/planks/separated_parquet", - "top": "new_soviet:block/floor/planks/separated_parquet" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/separated_parquet_slab_top.json b/src/main/generated/assets/new_soviet/models/block/separated_parquet_slab_top.json deleted file mode 100644 index d7db9b8..0000000 --- a/src/main/generated/assets/new_soviet/models/block/separated_parquet_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "new_soviet:block/floor/planks/separated_parquet", - "side": "new_soviet:block/floor/planks/separated_parquet", - "top": "new_soviet:block/floor/planks/separated_parquet" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/separated_parquet_stairs.json b/src/main/generated/assets/new_soviet/models/block/separated_parquet_stairs.json deleted file mode 100644 index 4968416..0000000 --- a/src/main/generated/assets/new_soviet/models/block/separated_parquet_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "new_soviet:block/floor/planks/separated_parquet", - "side": "new_soviet:block/floor/planks/separated_parquet", - "top": "new_soviet:block/floor/planks/separated_parquet" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/separated_parquet_stairs_inner.json b/src/main/generated/assets/new_soviet/models/block/separated_parquet_stairs_inner.json deleted file mode 100644 index f5e7d17..0000000 --- a/src/main/generated/assets/new_soviet/models/block/separated_parquet_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "new_soviet:block/floor/planks/separated_parquet", - "side": "new_soviet:block/floor/planks/separated_parquet", - "top": "new_soviet:block/floor/planks/separated_parquet" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/separated_parquet_stairs_outer.json b/src/main/generated/assets/new_soviet/models/block/separated_parquet_stairs_outer.json deleted file mode 100644 index 244914d..0000000 --- a/src/main/generated/assets/new_soviet/models/block/separated_parquet_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "new_soviet:block/floor/planks/separated_parquet", - "side": "new_soviet:block/floor/planks/separated_parquet", - "top": "new_soviet:block/floor/planks/separated_parquet" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/straight_oak_parquet.json b/src/main/generated/assets/new_soviet/models/block/straight_oak_parquet.json new file mode 100644 index 0000000..e098c81 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/straight_oak_parquet.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "new_soviet:block/floor/planks/straight_oak_parquet" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/straight_oak_parquet_slab.json b/src/main/generated/assets/new_soviet/models/block/straight_oak_parquet_slab.json new file mode 100644 index 0000000..c396b97 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/straight_oak_parquet_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "new_soviet:block/floor/planks/straight_oak_parquet", + "side": "new_soviet:block/floor/planks/straight_oak_parquet", + "top": "new_soviet:block/floor/planks/straight_oak_parquet" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/straight_oak_parquet_slab_top.json b/src/main/generated/assets/new_soviet/models/block/straight_oak_parquet_slab_top.json new file mode 100644 index 0000000..f2519c2 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/straight_oak_parquet_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "new_soviet:block/floor/planks/straight_oak_parquet", + "side": "new_soviet:block/floor/planks/straight_oak_parquet", + "top": "new_soviet:block/floor/planks/straight_oak_parquet" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/straight_oak_parquet_stairs.json b/src/main/generated/assets/new_soviet/models/block/straight_oak_parquet_stairs.json new file mode 100644 index 0000000..082fcb6 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/straight_oak_parquet_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "new_soviet:block/floor/planks/straight_oak_parquet", + "side": "new_soviet:block/floor/planks/straight_oak_parquet", + "top": "new_soviet:block/floor/planks/straight_oak_parquet" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/straight_oak_parquet_stairs_inner.json b/src/main/generated/assets/new_soviet/models/block/straight_oak_parquet_stairs_inner.json new file mode 100644 index 0000000..4bbf479 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/straight_oak_parquet_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "new_soviet:block/floor/planks/straight_oak_parquet", + "side": "new_soviet:block/floor/planks/straight_oak_parquet", + "top": "new_soviet:block/floor/planks/straight_oak_parquet" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/straight_oak_parquet_stairs_outer.json b/src/main/generated/assets/new_soviet/models/block/straight_oak_parquet_stairs_outer.json new file mode 100644 index 0000000..3a9dbfb --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/straight_oak_parquet_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "new_soviet:block/floor/planks/straight_oak_parquet", + "side": "new_soviet:block/floor/planks/straight_oak_parquet", + "top": "new_soviet:block/floor/planks/straight_oak_parquet" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/straight_parquet.json b/src/main/generated/assets/new_soviet/models/block/straight_parquet.json deleted file mode 100644 index c059365..0000000 --- a/src/main/generated/assets/new_soviet/models/block/straight_parquet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/floor/planks/straight_parquet" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/straight_parquet_slab.json b/src/main/generated/assets/new_soviet/models/block/straight_parquet_slab.json deleted file mode 100644 index f56879d..0000000 --- a/src/main/generated/assets/new_soviet/models/block/straight_parquet_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "new_soviet:block/floor/planks/straight_parquet", - "side": "new_soviet:block/floor/planks/straight_parquet", - "top": "new_soviet:block/floor/planks/straight_parquet" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/straight_parquet_slab_top.json b/src/main/generated/assets/new_soviet/models/block/straight_parquet_slab_top.json deleted file mode 100644 index fe65e12..0000000 --- a/src/main/generated/assets/new_soviet/models/block/straight_parquet_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "new_soviet:block/floor/planks/straight_parquet", - "side": "new_soviet:block/floor/planks/straight_parquet", - "top": "new_soviet:block/floor/planks/straight_parquet" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/straight_parquet_stairs.json b/src/main/generated/assets/new_soviet/models/block/straight_parquet_stairs.json deleted file mode 100644 index 86494be..0000000 --- a/src/main/generated/assets/new_soviet/models/block/straight_parquet_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "new_soviet:block/floor/planks/straight_parquet", - "side": "new_soviet:block/floor/planks/straight_parquet", - "top": "new_soviet:block/floor/planks/straight_parquet" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/straight_parquet_stairs_inner.json b/src/main/generated/assets/new_soviet/models/block/straight_parquet_stairs_inner.json deleted file mode 100644 index 54beab5..0000000 --- a/src/main/generated/assets/new_soviet/models/block/straight_parquet_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "new_soviet:block/floor/planks/straight_parquet", - "side": "new_soviet:block/floor/planks/straight_parquet", - "top": "new_soviet:block/floor/planks/straight_parquet" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/straight_parquet_stairs_outer.json b/src/main/generated/assets/new_soviet/models/block/straight_parquet_stairs_outer.json deleted file mode 100644 index 99099a6..0000000 --- a/src/main/generated/assets/new_soviet/models/block/straight_parquet_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "new_soviet:block/floor/planks/straight_parquet", - "side": "new_soviet:block/floor/planks/straight_parquet", - "top": "new_soviet:block/floor/planks/straight_parquet" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/separated_oak_parquet.json b/src/main/generated/assets/new_soviet/models/item/separated_oak_parquet.json new file mode 100644 index 0000000..64acce0 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/item/separated_oak_parquet.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/separated_oak_parquet" +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/separated_oak_parquet_slab.json b/src/main/generated/assets/new_soviet/models/item/separated_oak_parquet_slab.json new file mode 100644 index 0000000..e988d03 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/item/separated_oak_parquet_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/separated_oak_parquet_slab" +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/separated_oak_parquet_stairs.json b/src/main/generated/assets/new_soviet/models/item/separated_oak_parquet_stairs.json new file mode 100644 index 0000000..44fa8c6 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/item/separated_oak_parquet_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/separated_oak_parquet_stairs" +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/separated_parquet.json b/src/main/generated/assets/new_soviet/models/item/separated_parquet.json deleted file mode 100644 index c918acc..0000000 --- a/src/main/generated/assets/new_soviet/models/item/separated_parquet.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "new_soviet:block/separated_parquet" -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/separated_parquet_slab.json b/src/main/generated/assets/new_soviet/models/item/separated_parquet_slab.json deleted file mode 100644 index 1348f00..0000000 --- a/src/main/generated/assets/new_soviet/models/item/separated_parquet_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "new_soviet:block/separated_parquet_slab" -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/separated_parquet_stairs.json b/src/main/generated/assets/new_soviet/models/item/separated_parquet_stairs.json deleted file mode 100644 index ea142e8..0000000 --- a/src/main/generated/assets/new_soviet/models/item/separated_parquet_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "new_soviet:block/separated_parquet_stairs" -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/straight_oak_parquet.json b/src/main/generated/assets/new_soviet/models/item/straight_oak_parquet.json new file mode 100644 index 0000000..ca1441f --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/item/straight_oak_parquet.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/straight_oak_parquet" +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/straight_oak_parquet_slab.json b/src/main/generated/assets/new_soviet/models/item/straight_oak_parquet_slab.json new file mode 100644 index 0000000..52dd5f4 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/item/straight_oak_parquet_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/straight_oak_parquet_slab" +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/straight_oak_parquet_stairs.json b/src/main/generated/assets/new_soviet/models/item/straight_oak_parquet_stairs.json new file mode 100644 index 0000000..b39241a --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/item/straight_oak_parquet_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/straight_oak_parquet_stairs" +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/straight_parquet.json b/src/main/generated/assets/new_soviet/models/item/straight_parquet.json deleted file mode 100644 index 6c96b84..0000000 --- a/src/main/generated/assets/new_soviet/models/item/straight_parquet.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "new_soviet:block/straight_parquet" -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/straight_parquet_slab.json b/src/main/generated/assets/new_soviet/models/item/straight_parquet_slab.json deleted file mode 100644 index f8f8ea4..0000000 --- a/src/main/generated/assets/new_soviet/models/item/straight_parquet_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "new_soviet:block/straight_parquet_slab" -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/straight_parquet_stairs.json b/src/main/generated/assets/new_soviet/models/item/straight_parquet_stairs.json deleted file mode 100644 index 3c87d15..0000000 --- a/src/main/generated/assets/new_soviet/models/item/straight_parquet_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "new_soviet:block/straight_parquet_stairs" -} \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/blocks/mineable/axe.json b/src/main/generated/data/minecraft/tags/blocks/mineable/axe.json index 3fd25dc..49f8bcd 100644 --- a/src/main/generated/data/minecraft/tags/blocks/mineable/axe.json +++ b/src/main/generated/data/minecraft/tags/blocks/mineable/axe.json @@ -22,8 +22,8 @@ "new_soviet:herringbone_spruce_planks", "new_soviet:cross_spruce_planks", "new_soviet:herringbone_dark_oak_parquet", - "new_soviet:straight_parquet", - "new_soviet:separated_parquet", + "new_soviet:straight_oak_parquet", + "new_soviet:separated_oak_parquet", "new_soviet:green_linoleum", "new_soviet:blue_linoleum", "new_soviet:red_linoleum", @@ -78,10 +78,10 @@ "new_soviet:cross_spruce_planks_slab", "new_soviet:herringbone_dark_oak_parquet_stairs", "new_soviet:herringbone_dark_oak_parquet_slab", - "new_soviet:straight_parquet_stairs", - "new_soviet:straight_parquet_slab", - "new_soviet:separated_parquet_stairs", - "new_soviet:separated_parquet_slab", + "new_soviet:straight_oak_parquet_stairs", + "new_soviet:straight_oak_parquet_slab", + "new_soviet:separated_oak_parquet_stairs", + "new_soviet:separated_oak_parquet_slab", "new_soviet:green_linoleum_stairs", "new_soviet:green_linoleum_slab", "new_soviet:blue_linoleum_stairs", diff --git a/src/main/generated/data/minecraft/tags/blocks/slabs.json b/src/main/generated/data/minecraft/tags/blocks/slabs.json index 3e1044d..55c1910 100644 --- a/src/main/generated/data/minecraft/tags/blocks/slabs.json +++ b/src/main/generated/data/minecraft/tags/blocks/slabs.json @@ -95,8 +95,8 @@ "new_soviet:herringbone_spruce_planks_slab", "new_soviet:cross_spruce_planks_slab", "new_soviet:herringbone_dark_oak_parquet_slab", - "new_soviet:straight_parquet_slab", - "new_soviet:separated_parquet_slab", + "new_soviet:straight_oak_parquet_slab", + "new_soviet:separated_oak_parquet_slab", "new_soviet:green_linoleum_slab", "new_soviet:blue_linoleum_slab", "new_soviet:red_linoleum_slab", diff --git a/src/main/generated/data/minecraft/tags/blocks/stairs.json b/src/main/generated/data/minecraft/tags/blocks/stairs.json index 2ff24a5..25261d1 100644 --- a/src/main/generated/data/minecraft/tags/blocks/stairs.json +++ b/src/main/generated/data/minecraft/tags/blocks/stairs.json @@ -95,8 +95,8 @@ "new_soviet:herringbone_spruce_planks_stairs", "new_soviet:cross_spruce_planks_stairs", "new_soviet:herringbone_dark_oak_parquet_stairs", - "new_soviet:straight_parquet_stairs", - "new_soviet:separated_parquet_stairs", + "new_soviet:straight_oak_parquet_stairs", + "new_soviet:separated_oak_parquet_stairs", "new_soviet:green_linoleum_stairs", "new_soviet:blue_linoleum_stairs", "new_soviet:red_linoleum_stairs", diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_parquet_from_oak_planks_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_oak_parquet_from_oak_planks_stonecutting.json similarity index 78% rename from src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_parquet_from_oak_planks_stonecutting.json rename to src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_oak_parquet_from_oak_planks_stonecutting.json index 343b315..09bd861 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_parquet_from_oak_planks_stonecutting.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_oak_parquet_from_oak_planks_stonecutting.json @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "minecraft:straight_parquet_from_oak_planks_stonecutting" + "recipe": "minecraft:separated_oak_parquet_from_oak_planks_stonecutting" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "minecraft:straight_parquet_from_oak_planks_stonecutting" + "minecraft:separated_oak_parquet_from_oak_planks_stonecutting" ] }, "sends_telemetry_event": false diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_parquet_stairs.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_oak_parquet_slab.json similarity index 68% rename from src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_parquet_stairs.json rename to src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_oak_parquet_slab.json index d00fa6c..ccb4577 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_parquet_stairs.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_oak_parquet_slab.json @@ -1,12 +1,12 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_straight_parquet": { + "has_separated_oak_parquet": { "conditions": { "items": [ { "items": [ - "new_soviet:straight_parquet" + "new_soviet:separated_oak_parquet" ] } ] @@ -15,20 +15,20 @@ }, "has_the_recipe": { "conditions": { - "recipe": "new_soviet:straight_parquet_stairs" + "recipe": "new_soviet:separated_oak_parquet_slab" }, "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_straight_parquet", + "has_separated_oak_parquet", "has_the_recipe" ] ], "rewards": { "recipes": [ - "new_soviet:straight_parquet_stairs" + "new_soviet:separated_oak_parquet_slab" ] }, "sends_telemetry_event": false diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_oak_parquet_slab_from_separated_oak_parquet_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_oak_parquet_slab_from_separated_oak_parquet_stonecutting.json new file mode 100644 index 0000000..b6bbd16 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_oak_parquet_slab_from_separated_oak_parquet_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_separated_oak_parquet": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:separated_oak_parquet" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:separated_oak_parquet_slab_from_separated_oak_parquet_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_separated_oak_parquet", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:separated_oak_parquet_slab_from_separated_oak_parquet_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_parquet_stairs.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_oak_parquet_stairs.json similarity index 67% rename from src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_parquet_stairs.json rename to src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_oak_parquet_stairs.json index f1e27fa..a487f45 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_parquet_stairs.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_oak_parquet_stairs.json @@ -1,12 +1,12 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_separated_parquet": { + "has_separated_oak_parquet": { "conditions": { "items": [ { "items": [ - "new_soviet:separated_parquet" + "new_soviet:separated_oak_parquet" ] } ] @@ -15,20 +15,20 @@ }, "has_the_recipe": { "conditions": { - "recipe": "new_soviet:separated_parquet_stairs" + "recipe": "new_soviet:separated_oak_parquet_stairs" }, "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_separated_parquet", + "has_separated_oak_parquet", "has_the_recipe" ] ], "rewards": { "recipes": [ - "new_soviet:separated_parquet_stairs" + "new_soviet:separated_oak_parquet_stairs" ] }, "sends_telemetry_event": false diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_parquet_slab_from_straight_parquet_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_oak_parquet_stairs_from_separated_oak_parquet_stonecutting.json similarity index 64% rename from src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_parquet_slab_from_straight_parquet_stonecutting.json rename to src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_oak_parquet_stairs_from_separated_oak_parquet_stonecutting.json index 8cda76b..eb38dae 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_parquet_slab_from_straight_parquet_stonecutting.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_oak_parquet_stairs_from_separated_oak_parquet_stonecutting.json @@ -1,12 +1,12 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_straight_parquet": { + "has_separated_oak_parquet": { "conditions": { "items": [ { "items": [ - "new_soviet:straight_parquet" + "new_soviet:separated_oak_parquet" ] } ] @@ -15,20 +15,20 @@ }, "has_the_recipe": { "conditions": { - "recipe": "minecraft:straight_parquet_slab_from_straight_parquet_stonecutting" + "recipe": "minecraft:separated_oak_parquet_stairs_from_separated_oak_parquet_stonecutting" }, "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_straight_parquet", + "has_separated_oak_parquet", "has_the_recipe" ] ], "rewards": { "recipes": [ - "minecraft:straight_parquet_slab_from_straight_parquet_stonecutting" + "minecraft:separated_oak_parquet_stairs_from_separated_oak_parquet_stonecutting" ] }, "sends_telemetry_event": false diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_parquet_stairs_from_separated_parquet_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_parquet_stairs_from_separated_parquet_stonecutting.json deleted file mode 100644 index d16c536..0000000 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_parquet_stairs_from_separated_parquet_stonecutting.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_separated_parquet": { - "conditions": { - "items": [ - { - "items": [ - "new_soviet:separated_parquet" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:separated_parquet_stairs_from_separated_parquet_stonecutting" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_separated_parquet", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:separated_parquet_stairs_from_separated_parquet_stonecutting" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_parquet_from_oak_planks_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_oak_parquet_from_oak_planks_stonecutting.json similarity index 79% rename from src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_parquet_from_oak_planks_stonecutting.json rename to src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_oak_parquet_from_oak_planks_stonecutting.json index 43bc92e..a2d7e25 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_parquet_from_oak_planks_stonecutting.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_oak_parquet_from_oak_planks_stonecutting.json @@ -15,7 +15,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "minecraft:separated_parquet_from_oak_planks_stonecutting" + "recipe": "minecraft:straight_oak_parquet_from_oak_planks_stonecutting" }, "trigger": "minecraft:recipe_unlocked" } @@ -28,7 +28,7 @@ ], "rewards": { "recipes": [ - "minecraft:separated_parquet_from_oak_planks_stonecutting" + "minecraft:straight_oak_parquet_from_oak_planks_stonecutting" ] }, "sends_telemetry_event": false diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_parquet_slab.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_oak_parquet_slab.json similarity index 68% rename from src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_parquet_slab.json rename to src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_oak_parquet_slab.json index f699704..d53c396 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_parquet_slab.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_oak_parquet_slab.json @@ -1,12 +1,12 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_straight_parquet": { + "has_straight_oak_parquet": { "conditions": { "items": [ { "items": [ - "new_soviet:straight_parquet" + "new_soviet:straight_oak_parquet" ] } ] @@ -15,20 +15,20 @@ }, "has_the_recipe": { "conditions": { - "recipe": "new_soviet:straight_parquet_slab" + "recipe": "new_soviet:straight_oak_parquet_slab" }, "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_straight_parquet", + "has_straight_oak_parquet", "has_the_recipe" ] ], "rewards": { "recipes": [ - "new_soviet:straight_parquet_slab" + "new_soviet:straight_oak_parquet_slab" ] }, "sends_telemetry_event": false diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_parquet_slab_from_separated_parquet_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_oak_parquet_slab_from_straight_oak_parquet_stonecutting.json similarity index 61% rename from src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_parquet_slab_from_separated_parquet_stonecutting.json rename to src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_oak_parquet_slab_from_straight_oak_parquet_stonecutting.json index 807e0a1..81760be 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_parquet_slab_from_separated_parquet_stonecutting.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_oak_parquet_slab_from_straight_oak_parquet_stonecutting.json @@ -1,12 +1,12 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_separated_parquet": { + "has_straight_oak_parquet": { "conditions": { "items": [ { "items": [ - "new_soviet:separated_parquet" + "new_soviet:straight_oak_parquet" ] } ] @@ -15,20 +15,20 @@ }, "has_the_recipe": { "conditions": { - "recipe": "minecraft:separated_parquet_slab_from_separated_parquet_stonecutting" + "recipe": "minecraft:straight_oak_parquet_slab_from_straight_oak_parquet_stonecutting" }, "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_separated_parquet", + "has_straight_oak_parquet", "has_the_recipe" ] ], "rewards": { "recipes": [ - "minecraft:separated_parquet_slab_from_separated_parquet_stonecutting" + "minecraft:straight_oak_parquet_slab_from_straight_oak_parquet_stonecutting" ] }, "sends_telemetry_event": false diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_parquet_slab.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_oak_parquet_stairs.json similarity index 68% rename from src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_parquet_slab.json rename to src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_oak_parquet_stairs.json index d91c21d..528e92c 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_parquet_slab.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_oak_parquet_stairs.json @@ -1,12 +1,12 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_separated_parquet": { + "has_straight_oak_parquet": { "conditions": { "items": [ { "items": [ - "new_soviet:separated_parquet" + "new_soviet:straight_oak_parquet" ] } ] @@ -15,20 +15,20 @@ }, "has_the_recipe": { "conditions": { - "recipe": "new_soviet:separated_parquet_slab" + "recipe": "new_soviet:straight_oak_parquet_stairs" }, "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_separated_parquet", + "has_straight_oak_parquet", "has_the_recipe" ] ], "rewards": { "recipes": [ - "new_soviet:separated_parquet_slab" + "new_soviet:straight_oak_parquet_stairs" ] }, "sends_telemetry_event": false diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_oak_parquet_stairs_from_straight_oak_parquet_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_oak_parquet_stairs_from_straight_oak_parquet_stonecutting.json new file mode 100644 index 0000000..1cfdb4a --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_oak_parquet_stairs_from_straight_oak_parquet_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_straight_oak_parquet": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:straight_oak_parquet" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:straight_oak_parquet_stairs_from_straight_oak_parquet_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_straight_oak_parquet", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:straight_oak_parquet_stairs_from_straight_oak_parquet_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_parquet_stairs_from_straight_parquet_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_parquet_stairs_from_straight_parquet_stonecutting.json deleted file mode 100644 index 44f3de2..0000000 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_parquet_stairs_from_straight_parquet_stonecutting.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_straight_parquet": { - "conditions": { - "items": [ - { - "items": [ - "new_soviet:straight_parquet" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "minecraft:straight_parquet_stairs_from_straight_parquet_stonecutting" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_straight_parquet", - "has_the_recipe" - ] - ], - "rewards": { - "recipes": [ - "minecraft:straight_parquet_stairs_from_straight_parquet_stonecutting" - ] - }, - "sends_telemetry_event": false -} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/straight_parquet_slab.json b/src/main/generated/data/new_soviet/loot_tables/blocks/separated_oak_parquet.json similarity index 84% rename from src/main/generated/data/new_soviet/loot_tables/blocks/straight_parquet_slab.json rename to src/main/generated/data/new_soviet/loot_tables/blocks/separated_oak_parquet.json index d4b55f2..b286aca 100644 --- a/src/main/generated/data/new_soviet/loot_tables/blocks/straight_parquet_slab.json +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/separated_oak_parquet.json @@ -11,7 +11,7 @@ "entries": [ { "type": "minecraft:item", - "name": "new_soviet:straight_parquet_slab" + "name": "new_soviet:separated_oak_parquet" } ], "rolls": 1.0 diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/separated_parquet_slab.json b/src/main/generated/data/new_soviet/loot_tables/blocks/separated_oak_parquet_slab.json similarity index 83% rename from src/main/generated/data/new_soviet/loot_tables/blocks/separated_parquet_slab.json rename to src/main/generated/data/new_soviet/loot_tables/blocks/separated_oak_parquet_slab.json index 2af1a6d..6d6fe8f 100644 --- a/src/main/generated/data/new_soviet/loot_tables/blocks/separated_parquet_slab.json +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/separated_oak_parquet_slab.json @@ -11,7 +11,7 @@ "entries": [ { "type": "minecraft:item", - "name": "new_soviet:separated_parquet_slab" + "name": "new_soviet:separated_oak_parquet_slab" } ], "rolls": 1.0 diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/separated_oak_parquet_stairs.json b/src/main/generated/data/new_soviet/loot_tables/blocks/separated_oak_parquet_stairs.json new file mode 100644 index 0000000..c759f18 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/separated_oak_parquet_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:separated_oak_parquet_stairs" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/straight_parquet.json b/src/main/generated/data/new_soviet/loot_tables/blocks/straight_oak_parquet.json similarity index 85% rename from src/main/generated/data/new_soviet/loot_tables/blocks/straight_parquet.json rename to src/main/generated/data/new_soviet/loot_tables/blocks/straight_oak_parquet.json index ce049d4..e0803cb 100644 --- a/src/main/generated/data/new_soviet/loot_tables/blocks/straight_parquet.json +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/straight_oak_parquet.json @@ -11,7 +11,7 @@ "entries": [ { "type": "minecraft:item", - "name": "new_soviet:straight_parquet" + "name": "new_soviet:straight_oak_parquet" } ], "rolls": 1.0 diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/separated_parquet_stairs.json b/src/main/generated/data/new_soviet/loot_tables/blocks/straight_oak_parquet_slab.json similarity index 83% rename from src/main/generated/data/new_soviet/loot_tables/blocks/separated_parquet_stairs.json rename to src/main/generated/data/new_soviet/loot_tables/blocks/straight_oak_parquet_slab.json index 2989705..d6171b6 100644 --- a/src/main/generated/data/new_soviet/loot_tables/blocks/separated_parquet_stairs.json +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/straight_oak_parquet_slab.json @@ -11,7 +11,7 @@ "entries": [ { "type": "minecraft:item", - "name": "new_soviet:separated_parquet_stairs" + "name": "new_soviet:straight_oak_parquet_slab" } ], "rolls": 1.0 diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/separated_parquet.json b/src/main/generated/data/new_soviet/loot_tables/blocks/straight_oak_parquet_stairs.json similarity index 83% rename from src/main/generated/data/new_soviet/loot_tables/blocks/separated_parquet.json rename to src/main/generated/data/new_soviet/loot_tables/blocks/straight_oak_parquet_stairs.json index db5e0bf..1da1155 100644 --- a/src/main/generated/data/new_soviet/loot_tables/blocks/separated_parquet.json +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/straight_oak_parquet_stairs.json @@ -11,7 +11,7 @@ "entries": [ { "type": "minecraft:item", - "name": "new_soviet:separated_parquet" + "name": "new_soviet:straight_oak_parquet_stairs" } ], "rolls": 1.0 diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/straight_parquet_stairs.json b/src/main/generated/data/new_soviet/loot_tables/blocks/straight_parquet_stairs.json deleted file mode 100644 index bd1f0f7..0000000 --- a/src/main/generated/data/new_soviet/loot_tables/blocks/straight_parquet_stairs.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "new_soviet:straight_parquet_stairs" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/straight_parquet_from_oak_planks_stonecutting.json b/src/main/generated/data/new_soviet/recipes/separated_oak_parquet_from_oak_planks_stonecutting.json similarity index 70% rename from src/main/generated/data/new_soviet/recipes/straight_parquet_from_oak_planks_stonecutting.json rename to src/main/generated/data/new_soviet/recipes/separated_oak_parquet_from_oak_planks_stonecutting.json index 4b885c3..e1d48c6 100644 --- a/src/main/generated/data/new_soviet/recipes/straight_parquet_from_oak_planks_stonecutting.json +++ b/src/main/generated/data/new_soviet/recipes/separated_oak_parquet_from_oak_planks_stonecutting.json @@ -4,5 +4,5 @@ "ingredient": { "item": "minecraft:oak_planks" }, - "result": "new_soviet:straight_parquet" + "result": "new_soviet:separated_oak_parquet" } \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/separated_parquet_slab.json b/src/main/generated/data/new_soviet/recipes/separated_oak_parquet_slab.json similarity index 65% rename from src/main/generated/data/new_soviet/recipes/separated_parquet_slab.json rename to src/main/generated/data/new_soviet/recipes/separated_oak_parquet_slab.json index 3a66234..41b0ef9 100644 --- a/src/main/generated/data/new_soviet/recipes/separated_parquet_slab.json +++ b/src/main/generated/data/new_soviet/recipes/separated_oak_parquet_slab.json @@ -3,7 +3,7 @@ "category": "building", "key": { "#": { - "item": "new_soviet:separated_parquet" + "item": "new_soviet:separated_oak_parquet" } }, "pattern": [ @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "new_soviet:separated_parquet_slab" + "item": "new_soviet:separated_oak_parquet_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/separated_oak_parquet_slab_from_separated_oak_parquet_stonecutting.json b/src/main/generated/data/new_soviet/recipes/separated_oak_parquet_slab_from_separated_oak_parquet_stonecutting.json new file mode 100644 index 0000000..d0af887 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/separated_oak_parquet_slab_from_separated_oak_parquet_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:separated_oak_parquet" + }, + "result": "new_soviet:separated_oak_parquet_slab" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/separated_parquet_stairs.json b/src/main/generated/data/new_soviet/recipes/separated_oak_parquet_stairs.json similarity index 67% rename from src/main/generated/data/new_soviet/recipes/separated_parquet_stairs.json rename to src/main/generated/data/new_soviet/recipes/separated_oak_parquet_stairs.json index 43a26a1..d2ffdf7 100644 --- a/src/main/generated/data/new_soviet/recipes/separated_parquet_stairs.json +++ b/src/main/generated/data/new_soviet/recipes/separated_oak_parquet_stairs.json @@ -3,7 +3,7 @@ "category": "building", "key": { "#": { - "item": "new_soviet:separated_parquet" + "item": "new_soviet:separated_oak_parquet" } }, "pattern": [ @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "new_soviet:separated_parquet_stairs" + "item": "new_soviet:separated_oak_parquet_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/separated_oak_parquet_stairs_from_separated_oak_parquet_stonecutting.json b/src/main/generated/data/new_soviet/recipes/separated_oak_parquet_stairs_from_separated_oak_parquet_stonecutting.json new file mode 100644 index 0000000..f5ce5b4 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/separated_oak_parquet_stairs_from_separated_oak_parquet_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:separated_oak_parquet" + }, + "result": "new_soviet:separated_oak_parquet_stairs" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/separated_parquet_slab_from_separated_parquet_stonecutting.json b/src/main/generated/data/new_soviet/recipes/separated_parquet_slab_from_separated_parquet_stonecutting.json deleted file mode 100644 index fdd7973..0000000 --- a/src/main/generated/data/new_soviet/recipes/separated_parquet_slab_from_separated_parquet_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 1, - "ingredient": { - "item": "new_soviet:separated_parquet" - }, - "result": "new_soviet:separated_parquet_slab" -} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/separated_parquet_stairs_from_separated_parquet_stonecutting.json b/src/main/generated/data/new_soviet/recipes/separated_parquet_stairs_from_separated_parquet_stonecutting.json deleted file mode 100644 index 6138d15..0000000 --- a/src/main/generated/data/new_soviet/recipes/separated_parquet_stairs_from_separated_parquet_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 1, - "ingredient": { - "item": "new_soviet:separated_parquet" - }, - "result": "new_soviet:separated_parquet_stairs" -} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/separated_parquet_from_oak_planks_stonecutting.json b/src/main/generated/data/new_soviet/recipes/straight_oak_parquet_from_oak_planks_stonecutting.json similarity index 70% rename from src/main/generated/data/new_soviet/recipes/separated_parquet_from_oak_planks_stonecutting.json rename to src/main/generated/data/new_soviet/recipes/straight_oak_parquet_from_oak_planks_stonecutting.json index eb5c12d..f9b9f67 100644 --- a/src/main/generated/data/new_soviet/recipes/separated_parquet_from_oak_planks_stonecutting.json +++ b/src/main/generated/data/new_soviet/recipes/straight_oak_parquet_from_oak_planks_stonecutting.json @@ -4,5 +4,5 @@ "ingredient": { "item": "minecraft:oak_planks" }, - "result": "new_soviet:separated_parquet" + "result": "new_soviet:straight_oak_parquet" } \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/straight_parquet_slab.json b/src/main/generated/data/new_soviet/recipes/straight_oak_parquet_slab.json similarity index 66% rename from src/main/generated/data/new_soviet/recipes/straight_parquet_slab.json rename to src/main/generated/data/new_soviet/recipes/straight_oak_parquet_slab.json index c8f6f9f..5b3031c 100644 --- a/src/main/generated/data/new_soviet/recipes/straight_parquet_slab.json +++ b/src/main/generated/data/new_soviet/recipes/straight_oak_parquet_slab.json @@ -3,7 +3,7 @@ "category": "building", "key": { "#": { - "item": "new_soviet:straight_parquet" + "item": "new_soviet:straight_oak_parquet" } }, "pattern": [ @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "new_soviet:straight_parquet_slab" + "item": "new_soviet:straight_oak_parquet_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/straight_oak_parquet_slab_from_straight_oak_parquet_stonecutting.json b/src/main/generated/data/new_soviet/recipes/straight_oak_parquet_slab_from_straight_oak_parquet_stonecutting.json new file mode 100644 index 0000000..4633587 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/straight_oak_parquet_slab_from_straight_oak_parquet_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:straight_oak_parquet" + }, + "result": "new_soviet:straight_oak_parquet_slab" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/straight_parquet_stairs.json b/src/main/generated/data/new_soviet/recipes/straight_oak_parquet_stairs.json similarity index 68% rename from src/main/generated/data/new_soviet/recipes/straight_parquet_stairs.json rename to src/main/generated/data/new_soviet/recipes/straight_oak_parquet_stairs.json index 33b736c..1145887 100644 --- a/src/main/generated/data/new_soviet/recipes/straight_parquet_stairs.json +++ b/src/main/generated/data/new_soviet/recipes/straight_oak_parquet_stairs.json @@ -3,7 +3,7 @@ "category": "building", "key": { "#": { - "item": "new_soviet:straight_parquet" + "item": "new_soviet:straight_oak_parquet" } }, "pattern": [ @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "new_soviet:straight_parquet_stairs" + "item": "new_soviet:straight_oak_parquet_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/straight_oak_parquet_stairs_from_straight_oak_parquet_stonecutting.json b/src/main/generated/data/new_soviet/recipes/straight_oak_parquet_stairs_from_straight_oak_parquet_stonecutting.json new file mode 100644 index 0000000..d1d182e --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/straight_oak_parquet_stairs_from_straight_oak_parquet_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:straight_oak_parquet" + }, + "result": "new_soviet:straight_oak_parquet_stairs" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/straight_parquet_slab_from_straight_parquet_stonecutting.json b/src/main/generated/data/new_soviet/recipes/straight_parquet_slab_from_straight_parquet_stonecutting.json deleted file mode 100644 index 3335b6e..0000000 --- a/src/main/generated/data/new_soviet/recipes/straight_parquet_slab_from_straight_parquet_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 1, - "ingredient": { - "item": "new_soviet:straight_parquet" - }, - "result": "new_soviet:straight_parquet_slab" -} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/straight_parquet_stairs_from_straight_parquet_stonecutting.json b/src/main/generated/data/new_soviet/recipes/straight_parquet_stairs_from_straight_parquet_stonecutting.json deleted file mode 100644 index 1569ce8..0000000 --- a/src/main/generated/data/new_soviet/recipes/straight_parquet_stairs_from_straight_parquet_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 1, - "ingredient": { - "item": "new_soviet:straight_parquet" - }, - "result": "new_soviet:straight_parquet_stairs" -} \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java b/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java index e457684..2ce9cc4 100644 --- a/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java +++ b/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java @@ -154,8 +154,8 @@ public class BlockLootTables extends FabricBlockLootTableProvider { addDrop(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS); addDrop(NSE_Blocks.CROSS_SPRUCE_PLANKS); addDrop(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET); - addDrop(NSE_Blocks.STRAIGHT_PARQUET); - addDrop(NSE_Blocks.SEPARATED_PARQUET); + addDrop(NSE_Blocks.STRAIGHT_OAK_PARQUET); + addDrop(NSE_Blocks.SEPARATED_OAK_PARQUET); addDrop(NSE_Blocks.GREEN_LINOLEUM); addDrop(NSE_Blocks.BLUE_LINOLEUM); addDrop(NSE_Blocks.RED_LINOLEUM); @@ -457,10 +457,10 @@ public class BlockLootTables extends FabricBlockLootTableProvider { addDrop(NSE_Blocks.CROSS_SPRUCE_PLANKS_STAIRS); addDrop(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_SLAB); addDrop(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_STAIRS); - addDrop(NSE_Blocks.STRAIGHT_PARQUET_SLAB); - addDrop(NSE_Blocks.STRAIGHT_PARQUET_STAIRS); - addDrop(NSE_Blocks.SEPARATED_PARQUET_SLAB); - addDrop(NSE_Blocks.SEPARATED_PARQUET_STAIRS); + addDrop(NSE_Blocks.STRAIGHT_OAK_PARQUET_SLAB); + addDrop(NSE_Blocks.STRAIGHT_OAK_PARQUET_STAIRS); + addDrop(NSE_Blocks.SEPARATED_OAK_PARQUET_SLAB); + addDrop(NSE_Blocks.SEPARATED_OAK_PARQUET_STAIRS); addDrop(NSE_Blocks.GREEN_LINOLEUM_SLAB); addDrop(NSE_Blocks.GREEN_LINOLEUM_STAIRS); addDrop(NSE_Blocks.BLUE_LINOLEUM_SLAB); diff --git a/src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java b/src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java index dec95d0..42a8518 100644 --- a/src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java +++ b/src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java @@ -364,8 +364,8 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider { .add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS) .add(NSE_Blocks.CROSS_SPRUCE_PLANKS) .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET) - .add(NSE_Blocks.STRAIGHT_PARQUET) - .add(NSE_Blocks.SEPARATED_PARQUET) + .add(NSE_Blocks.STRAIGHT_OAK_PARQUET) + .add(NSE_Blocks.SEPARATED_OAK_PARQUET) .add(NSE_Blocks.GREEN_LINOLEUM) .add(NSE_Blocks.BLUE_LINOLEUM) .add(NSE_Blocks.RED_LINOLEUM) @@ -420,10 +420,10 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider { .add(NSE_Blocks.CROSS_SPRUCE_PLANKS_SLAB) .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_STAIRS) .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_SLAB) - .add(NSE_Blocks.STRAIGHT_PARQUET_STAIRS) - .add(NSE_Blocks.STRAIGHT_PARQUET_SLAB) - .add(NSE_Blocks.SEPARATED_PARQUET_STAIRS) - .add(NSE_Blocks.SEPARATED_PARQUET_SLAB) + .add(NSE_Blocks.STRAIGHT_OAK_PARQUET_STAIRS) + .add(NSE_Blocks.STRAIGHT_OAK_PARQUET_SLAB) + .add(NSE_Blocks.SEPARATED_OAK_PARQUET_STAIRS) + .add(NSE_Blocks.SEPARATED_OAK_PARQUET_SLAB) .add(NSE_Blocks.GREEN_LINOLEUM_STAIRS) .add(NSE_Blocks.GREEN_LINOLEUM_SLAB) .add(NSE_Blocks.BLUE_LINOLEUM_STAIRS) @@ -603,8 +603,8 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider { .add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_STAIRS) .add(NSE_Blocks.CROSS_SPRUCE_PLANKS_STAIRS) .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_STAIRS) - .add(NSE_Blocks.STRAIGHT_PARQUET_STAIRS) - .add(NSE_Blocks.SEPARATED_PARQUET_STAIRS) + .add(NSE_Blocks.STRAIGHT_OAK_PARQUET_STAIRS) + .add(NSE_Blocks.SEPARATED_OAK_PARQUET_STAIRS) .add(NSE_Blocks.GREEN_LINOLEUM_STAIRS) .add(NSE_Blocks.BLUE_LINOLEUM_STAIRS) .add(NSE_Blocks.RED_LINOLEUM_STAIRS) @@ -716,8 +716,8 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider { .add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_SLAB) .add(NSE_Blocks.CROSS_SPRUCE_PLANKS_SLAB) .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_SLAB) - .add(NSE_Blocks.STRAIGHT_PARQUET_SLAB) - .add(NSE_Blocks.SEPARATED_PARQUET_SLAB) + .add(NSE_Blocks.STRAIGHT_OAK_PARQUET_SLAB) + .add(NSE_Blocks.SEPARATED_OAK_PARQUET_SLAB) .add(NSE_Blocks.GREEN_LINOLEUM_SLAB) .add(NSE_Blocks.BLUE_LINOLEUM_SLAB) .add(NSE_Blocks.RED_LINOLEUM_SLAB) diff --git a/src/main/java/su/a71/new_soviet/datagen/ItemTagGenerator.java b/src/main/java/su/a71/new_soviet/datagen/ItemTagGenerator.java index 708b6d8..6bc1d12 100644 --- a/src/main/java/su/a71/new_soviet/datagen/ItemTagGenerator.java +++ b/src/main/java/su/a71/new_soviet/datagen/ItemTagGenerator.java @@ -5,6 +5,7 @@ import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.tag.ItemTags; import su.a71.new_soviet.registration.NSE_Items; import su.a71.new_soviet.registration.NSE_Tags; import java.util.concurrent.CompletableFuture; @@ -22,5 +23,8 @@ public class ItemTagGenerator extends FabricTagProvider.ItemTagProvider { .add(NSE_Items.DICE_D4) .add(NSE_Items.DICE_D6) .add(NSE_Items.DICE_D20); + + getOrCreateTagBuilder(ItemTags.MUSIC_DISCS) + .add(NSE_Items.MUSIC_DISC_HEARTBEAT); } } \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/datagen/ModelGenerator.java b/src/main/java/su/a71/new_soviet/datagen/ModelGenerator.java index 498725c..25faebf 100644 --- a/src/main/java/su/a71/new_soviet/datagen/ModelGenerator.java +++ b/src/main/java/su/a71/new_soviet/datagen/ModelGenerator.java @@ -214,8 +214,8 @@ public class ModelGenerator extends FabricModelProvider { registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS, NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS_SLAB, "floor/planks"); registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET, NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_STAIRS, NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_SLAB, "floor/planks"); - registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.STRAIGHT_PARQUET, NSE_Blocks.STRAIGHT_PARQUET_STAIRS, NSE_Blocks.STRAIGHT_PARQUET_SLAB, "floor/planks"); - registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.SEPARATED_PARQUET, NSE_Blocks.SEPARATED_PARQUET_STAIRS, NSE_Blocks.SEPARATED_PARQUET_SLAB, "floor/planks"); + registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.STRAIGHT_OAK_PARQUET, NSE_Blocks.STRAIGHT_OAK_PARQUET_STAIRS, NSE_Blocks.STRAIGHT_OAK_PARQUET_SLAB, "floor/planks"); + registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.SEPARATED_OAK_PARQUET, NSE_Blocks.SEPARATED_OAK_PARQUET_STAIRS, NSE_Blocks.SEPARATED_OAK_PARQUET_SLAB, "floor/planks"); registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.GREEN_LINOLEUM, NSE_Blocks.GREEN_LINOLEUM_STAIRS, NSE_Blocks.GREEN_LINOLEUM_SLAB, "floor/linoleum"); registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.BLUE_LINOLEUM, NSE_Blocks.BLUE_LINOLEUM_STAIRS, NSE_Blocks.BLUE_LINOLEUM_SLAB, "floor/linoleum"); registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.RED_LINOLEUM, NSE_Blocks.RED_LINOLEUM_STAIRS, NSE_Blocks.RED_LINOLEUM_SLAB, "floor/linoleum"); diff --git a/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java b/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java index 8da1962..ff2d029 100644 --- a/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java +++ b/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java @@ -409,8 +409,8 @@ public class RecipeGenerator extends FabricRecipeProvider { stoneCuttingCategory(exporter, Blocks.OAK_PLANKS, Util.make(Lists.newArrayList(), list -> { list.add(NSE_Blocks.CROSS_OAK_PLANKS); list.add(NSE_Blocks.HERRINGBONE_OAK_PLANKS); - list.add(NSE_Blocks.STRAIGHT_PARQUET); - list.add(NSE_Blocks.SEPARATED_PARQUET); + list.add(NSE_Blocks.STRAIGHT_OAK_PARQUET); + list.add(NSE_Blocks.SEPARATED_OAK_PARQUET); }), RecipeCategory.BUILDING_BLOCKS); stoneCuttingCategory(exporter, Blocks.BIRCH_PLANKS, Util.make(Lists.newArrayList(), list -> { list.add(NSE_Blocks.CROSS_BIRCH_PLANKS); @@ -782,8 +782,8 @@ public class RecipeGenerator extends FabricRecipeProvider { offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS); offerStairsAndSlab(exporter, NSE_Blocks.CROSS_SPRUCE_PLANKS_STAIRS, NSE_Blocks.CROSS_SPRUCE_PLANKS_SLAB, NSE_Blocks.CROSS_SPRUCE_PLANKS); offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_STAIRS, NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_SLAB, NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET); - offerStairsAndSlab(exporter, NSE_Blocks.STRAIGHT_PARQUET_STAIRS, NSE_Blocks.STRAIGHT_PARQUET_SLAB, NSE_Blocks.STRAIGHT_PARQUET); - offerStairsAndSlab(exporter, NSE_Blocks.SEPARATED_PARQUET_STAIRS, NSE_Blocks.SEPARATED_PARQUET_SLAB, NSE_Blocks.SEPARATED_PARQUET); + offerStairsAndSlab(exporter, NSE_Blocks.STRAIGHT_OAK_PARQUET_STAIRS, NSE_Blocks.STRAIGHT_OAK_PARQUET_SLAB, NSE_Blocks.STRAIGHT_OAK_PARQUET); + offerStairsAndSlab(exporter, NSE_Blocks.SEPARATED_OAK_PARQUET_STAIRS, NSE_Blocks.SEPARATED_OAK_PARQUET_SLAB, NSE_Blocks.SEPARATED_OAK_PARQUET); offerStairsAndSlab(exporter, NSE_Blocks.GREEN_LINOLEUM_STAIRS, NSE_Blocks.GREEN_LINOLEUM_SLAB, NSE_Blocks.GREEN_LINOLEUM); offerStairsAndSlab(exporter, NSE_Blocks.BLUE_LINOLEUM_STAIRS, NSE_Blocks.BLUE_LINOLEUM_SLAB, NSE_Blocks.BLUE_LINOLEUM); offerStairsAndSlab(exporter, NSE_Blocks.RED_LINOLEUM_STAIRS, NSE_Blocks.RED_LINOLEUM_SLAB, NSE_Blocks.RED_LINOLEUM); diff --git a/src/main/java/su/a71/new_soviet/registration/NSE_Blocks.java b/src/main/java/su/a71/new_soviet/registration/NSE_Blocks.java index 6e5405e..59b87b6 100644 --- a/src/main/java/su/a71/new_soviet/registration/NSE_Blocks.java +++ b/src/main/java/su/a71/new_soviet/registration/NSE_Blocks.java @@ -413,12 +413,12 @@ public class NSE_Blocks extends NSE_BaseRegistration { public static final Block HERRINGBONE_DARK_OAK_PARQUET = new Block(FabricBlockSettings.create().sounds(NSE_Sounds.PARQUET_SOUNDS).strength(2f, 3f).mapColor(MapColor.OAK_TAN)); public static final StairsBlock HERRINGBONE_DARK_OAK_PARQUET_STAIRS = new StairsBlock(HERRINGBONE_DARK_OAK_PARQUET.getDefaultState(), FabricBlockSettings.copy(HERRINGBONE_DARK_OAK_PARQUET)); public static final SlabBlock HERRINGBONE_DARK_OAK_PARQUET_SLAB = new SlabBlock(FabricBlockSettings.copy(HERRINGBONE_DARK_OAK_PARQUET)); - public static final Block STRAIGHT_PARQUET = new Block(FabricBlockSettings.copy(HERRINGBONE_DARK_OAK_PARQUET)); - public static final StairsBlock STRAIGHT_PARQUET_STAIRS = new StairsBlock(STRAIGHT_PARQUET.getDefaultState(), FabricBlockSettings.copy(STRAIGHT_PARQUET)); - public static final SlabBlock STRAIGHT_PARQUET_SLAB = new SlabBlock(FabricBlockSettings.copy(STRAIGHT_PARQUET)); - public static final Block SEPARATED_PARQUET = new Block(FabricBlockSettings.copy(HERRINGBONE_DARK_OAK_PARQUET)); - public static final StairsBlock SEPARATED_PARQUET_STAIRS = new StairsBlock(SEPARATED_PARQUET.getDefaultState(), FabricBlockSettings.copy(SEPARATED_PARQUET)); - public static final SlabBlock SEPARATED_PARQUET_SLAB = new SlabBlock(FabricBlockSettings.copy(SEPARATED_PARQUET)); + public static final Block STRAIGHT_OAK_PARQUET = new Block(FabricBlockSettings.copy(HERRINGBONE_DARK_OAK_PARQUET)); + public static final StairsBlock STRAIGHT_OAK_PARQUET_STAIRS = new StairsBlock(STRAIGHT_OAK_PARQUET.getDefaultState(), FabricBlockSettings.copy(STRAIGHT_OAK_PARQUET)); + public static final SlabBlock STRAIGHT_OAK_PARQUET_SLAB = new SlabBlock(FabricBlockSettings.copy(STRAIGHT_OAK_PARQUET)); + public static final Block SEPARATED_OAK_PARQUET = new Block(FabricBlockSettings.copy(HERRINGBONE_DARK_OAK_PARQUET)); + public static final StairsBlock SEPARATED_OAK_PARQUET_STAIRS = new StairsBlock(SEPARATED_OAK_PARQUET.getDefaultState(), FabricBlockSettings.copy(SEPARATED_OAK_PARQUET)); + public static final SlabBlock SEPARATED_OAK_PARQUET_SLAB = new SlabBlock(FabricBlockSettings.copy(SEPARATED_OAK_PARQUET)); // LINOLEUM ======================= public static final Block GREEN_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.CHERRY_WOOD).strength(2, 3f).mapColor(MapColor.TERRACOTTA_GREEN)); @@ -912,12 +912,12 @@ public class NSE_Blocks extends NSE_BaseRegistration { registerBlock("herringbone_dark_oak_parquet", () -> HERRINGBONE_DARK_OAK_PARQUET, NSE_BUILDING_TAB); registerBlock("herringbone_dark_oak_parquet_stairs", () -> HERRINGBONE_DARK_OAK_PARQUET_STAIRS, NSE_BUILDING_TAB); registerBlock("herringbone_dark_oak_parquet_slab", () -> HERRINGBONE_DARK_OAK_PARQUET_SLAB, NSE_BUILDING_TAB); - registerBlock("straight_parquet", () -> STRAIGHT_PARQUET, NSE_BUILDING_TAB); - registerBlock("straight_parquet_stairs", () -> STRAIGHT_PARQUET_STAIRS, NSE_BUILDING_TAB); - registerBlock("straight_parquet_slab", () -> STRAIGHT_PARQUET_SLAB, NSE_BUILDING_TAB); - registerBlock("separated_parquet", () -> SEPARATED_PARQUET, NSE_BUILDING_TAB); - registerBlock("separated_parquet_stairs", () -> SEPARATED_PARQUET_STAIRS, NSE_BUILDING_TAB); - registerBlock("separated_parquet_slab", () -> SEPARATED_PARQUET_SLAB, NSE_BUILDING_TAB); + registerBlock("straight_oak_parquet", () -> STRAIGHT_OAK_PARQUET, NSE_BUILDING_TAB); + registerBlock("straight_oak_parquet_stairs", () -> STRAIGHT_OAK_PARQUET_STAIRS, NSE_BUILDING_TAB); + registerBlock("straight_oak_parquet_slab", () -> STRAIGHT_OAK_PARQUET_SLAB, NSE_BUILDING_TAB); + registerBlock("separated_oak_parquet", () -> SEPARATED_OAK_PARQUET, NSE_BUILDING_TAB); + registerBlock("separated_oak_parquet_stairs", () -> SEPARATED_OAK_PARQUET_STAIRS, NSE_BUILDING_TAB); + registerBlock("separated_oak_parquet_slab", () -> SEPARATED_OAK_PARQUET_SLAB, NSE_BUILDING_TAB); registerBlock("green_linoleum", () -> GREEN_LINOLEUM, NSE_BUILDING_TAB); registerBlock("green_linoleum_stairs", () -> GREEN_LINOLEUM_STAIRS, NSE_BUILDING_TAB); @@ -1027,8 +1027,8 @@ public class NSE_Blocks extends NSE_BaseRegistration { flammableBlockRegistry.add(HERRINGBONE_BAMBOO_PLANKS, 20, 5); flammableBlockRegistry.add(HERRINGBONE_DARK_OAK_PARQUET, 20, 5); - flammableBlockRegistry.add(STRAIGHT_PARQUET, 20, 5); - flammableBlockRegistry.add(SEPARATED_PARQUET, 20, 5); + flammableBlockRegistry.add(STRAIGHT_OAK_PARQUET, 20, 5); + flammableBlockRegistry.add(SEPARATED_OAK_PARQUET, 20, 5); flammableBlockRegistry.add(GREEN_LINOLEUM, 20, 5); flammableBlockRegistry.add(BLUE_LINOLEUM, 20, 5); @@ -1077,10 +1077,10 @@ public class NSE_Blocks extends NSE_BaseRegistration { flammableBlockRegistry.add(HERRINGBONE_DARK_OAK_PARQUET_STAIRS, 20, 5); flammableBlockRegistry.add(HERRINGBONE_DARK_OAK_PARQUET_SLAB, 20, 5); - flammableBlockRegistry.add(STRAIGHT_PARQUET_STAIRS, 20, 5); - flammableBlockRegistry.add(STRAIGHT_PARQUET_SLAB, 20, 5); - flammableBlockRegistry.add(SEPARATED_PARQUET_STAIRS, 20, 5); - flammableBlockRegistry.add(SEPARATED_PARQUET_SLAB, 20, 5); + flammableBlockRegistry.add(STRAIGHT_OAK_PARQUET_STAIRS, 20, 5); + flammableBlockRegistry.add(STRAIGHT_OAK_PARQUET_SLAB, 20, 5); + flammableBlockRegistry.add(SEPARATED_OAK_PARQUET_STAIRS, 20, 5); + flammableBlockRegistry.add(SEPARATED_OAK_PARQUET_SLAB, 20, 5); flammableBlockRegistry.add(GREEN_LINOLEUM_STAIRS, 20, 5); flammableBlockRegistry.add(GREEN_LINOLEUM_SLAB, 20, 5); diff --git a/src/main/resources/assets/new_soviet/lang/en_us.json b/src/main/resources/assets/new_soviet/lang/en_us.json index 6e6663f..874f919 100644 --- a/src/main/resources/assets/new_soviet/lang/en_us.json +++ b/src/main/resources/assets/new_soviet/lang/en_us.json @@ -131,9 +131,9 @@ "block.new_soviet.cross_mangrove_planks": "Cross Mangrove Planks", "block.new_soviet.herringbone_spruce_planks": "Herringbone Spruce Planks", "block.new_soviet.cross_spruce_planks": "Cross Spruce Planks", - "block.new_soviet.herringbone_parquet": "Herringbone Parquet", - "block.new_soviet.straight_parquet": "Straight Parquet", - "block.new_soviet.separated_parquet": "Separated Parquet", + "block.new_soviet.herringbone_dark_oak_parquet": "Herringbone Dark Oak Parquet", + "block.new_soviet.straight_oak_parquet": "Straight Oak Parquet", + "block.new_soviet.separated_oak_parquet": "Separated Oak Parquet", "block.new_soviet.green_linoleum": "Green Linoleum", "block.new_soviet.blue_linoleum": "Blue Linoleum", "block.new_soviet.red_linoleum": "Red Linoleum", @@ -148,6 +148,7 @@ "block.new_soviet.tv": "Orange TV", "block.new_soviet.red_tv": "Red TV", "block.new_soviet.brown_tv": "Brown TV", + "block.new_soviet.green_tv": "Green TV", "block.new_soviet.radio_receiver": "Radio", "block.new_soviet.table_lamp": "Table Lamp", "block.new_soviet.ceiling_fan": "Ceiling Fan", @@ -445,12 +446,12 @@ "block.new_soviet.herringbone_spruce_planks_stairs": "Herringbone Spruce Stairs", "block.new_soviet.cross_spruce_planks_slab": "Cross Spruce Slab", "block.new_soviet.cross_spruce_planks_stairs": "Cross Spruce Stairs", - "block.new_soviet.herringbone_parquet_slab": "Herringbone Parquet Slab", - "block.new_soviet.herringbone_parquet_stairs": "Herringbone Parquet Stairs", - "block.new_soviet.straight_parquet_slab": "Straight Parquet Slab", - "block.new_soviet.straight_parquet_stairs": "Straight Parquet Stairs", - "block.new_soviet.separated_parquet_slab": "Separated Parquet Slab", - "block.new_soviet.separated_parquet_stairs": "Separated Parquet Stairs", + "block.new_soviet.herringbone_dark_oak_parquet_slab": "Herringbone Dark Oak Parquet Slab", + "block.new_soviet.herringbone_dark_oak_parquet_stairs": "Herringbone Dark Oak Parquet Stairs", + "block.new_soviet.straight_oak_parquet_slab": "Straight Oak Parquet Slab", + "block.new_soviet.straight_oak_parquet_stairs": "Straight Oak Parquet Stairs", + "block.new_soviet.separated_oak_parquet_slab": "Separated Oak Parquet Slab", + "block.new_soviet.separated_oak_parquet_stairs": "Separated Oak Parquet Stairs", "block.new_soviet.green_linoleum_slab": "Green Linoleum Slab", "block.new_soviet.green_linoleum_stairs": "Green Linoleum Stairs", "block.new_soviet.blue_linoleum_slab": "Blue Linoleum Slab", @@ -510,6 +511,9 @@ "subtitles.new_soviet.tv_break": "TV screen shattered", "item.new_soviet.antenna": "Antenna", + "item.new_soviet.music_disc_heartbeat": "Music Disc", + "item.new_soviet.music_disc_heartbeat.desc": "Kan Gao - Heartbeat", + "advancement.new_soviet.root.name": "A New Era", "advancement.new_soviet.root.desc": "Time to create something great", "advancement.new_soviet.sickle.name": "Tool of a worker", diff --git a/src/main/resources/assets/new_soviet/sounds.json b/src/main/resources/assets/new_soviet/sounds.json index b09a48d..7e73e3f 100644 --- a/src/main/resources/assets/new_soviet/sounds.json +++ b/src/main/resources/assets/new_soviet/sounds.json @@ -111,6 +111,14 @@ "sounds": [ "new_soviet:tv_break" ] + }, + "heartbeat_kan_gao": { + "sounds": [ + { + "name": "new_soviet:heartbeat_kan_gao", + "stream": true + } + ] } }