Ethyl/New-Soviet-Era
Ethyl/New-Soviet-Era
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: Ethyl:f2373e097145f653c0713e8ed61ba1efd28cbc4e
Branches Tags
Ethyl:1.20
Ethyl:1.20.1
...
compare: Ethyl:5bbb26ce819b0c5c66d11f7428d323ec056a2594
Branches Tags
Ethyl:1.20.1
Ethyl:1.20

2 commits
f2373e0971 ... 5bbb26ce81

Author SHA1 Message Date
Andrew-71
5bbb26ce81 Add USSR anthem music disc 2024-01-22 19:11:28 +03:00
Andrew-71
a385d76352 Parquet changes 2024-01-20 14:46:41 +03:00
99 changed files with 513 additions and 475 deletions
Show stats Expand all files Collapse all files

9
CHANGELOG
View file

@ -53,6 +53,7 @@ This version focuses on QOL and bug fixes
### Changelog 0.3 -> 0.4 ### Changelog 0.3 -> 0.4
* Concrete improvements * Concrete improvements
* 3 new colours - basic, dark green and orange * 3 new colours - basic, dark green and orange
* Concrete with bars can now be placed horizontally
* Bug fixes (see below) * Bug fixes (see below)
* Added 3(?) new banner patterns * Added 3(?) new banner patterns
* Sickle * Sickle
@ -60,10 +61,14 @@ This version focuses on QOL and bug fixes
* Grain(?) * Grain(?)
* Added a new antenna item to improve radio electronics recipes * Added a new antenna item to improve radio electronics recipes
* Changed textures for dirt road, green-white tiles and TV white noise * 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 * Bug fixes
* Fixed a few missing drops/tags/recipes related to concrete * Fixed a few missing drops/tags/recipes related to concrete
* Concrete with bars is now pickaxe mine-able * 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 * Cracked concrete now has a dyeing category
* Technical changes * Technical changes
* Minor asset location/name changes - e.g. concrete with bars models moved to separate folder * Minor asset location/name changes - e.g. concrete with bars models moved to separate folder
* Moved to newer Fabric versions

7
src/main/generated/assets/new_soviet/blockstates/separated_oak_parquet.json Normal file
View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "new_soviet:block/separated_oak_parquet"
}
}
}

13
src/main/generated/assets/new_soviet/blockstates/separated_oak_parquet_slab.json Normal file
View file

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

80
src/main/generated/assets/new_soviet/blockstates/separated_parquet_stairs.json → src/main/generated/assets/new_soviet/blockstates/separated_oak_parquet_stairs.json
View file

@ -1,206 +1,206 @@
{ {
"variants": { "variants": {
"facing=east,half=bottom,shape=inner_left": { "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, "uvlock": true,
"y": 270 "y": 270
}, },
"facing=east,half=bottom,shape=inner_right": { "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": { "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, "uvlock": true,
"y": 270 "y": 270
}, },
"facing=east,half=bottom,shape=outer_right": { "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": { "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": { "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, "uvlock": true,
"x": 180 "x": 180
}, },
"facing=east,half=top,shape=inner_right": { "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, "uvlock": true,
"x": 180, "x": 180,
"y": 90 "y": 90
}, },
"facing=east,half=top,shape=outer_left": { "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, "uvlock": true,
"x": 180 "x": 180
}, },
"facing=east,half=top,shape=outer_right": { "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, "uvlock": true,
"x": 180, "x": 180,
"y": 90 "y": 90
}, },
"facing=east,half=top,shape=straight": { "facing=east,half=top,shape=straight": {
"model": "new_soviet:block/separated_parquet_stairs", "model": "new_soviet:block/separated_oak_parquet_stairs",
"uvlock": true, "uvlock": true,
"x": 180 "x": 180
}, },
"facing=north,half=bottom,shape=inner_left": { "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, "uvlock": true,
"y": 180 "y": 180
}, },
"facing=north,half=bottom,shape=inner_right": { "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, "uvlock": true,
"y": 270 "y": 270
}, },
"facing=north,half=bottom,shape=outer_left": { "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, "uvlock": true,
"y": 180 "y": 180
}, },
"facing=north,half=bottom,shape=outer_right": { "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, "uvlock": true,
"y": 270 "y": 270
}, },
"facing=north,half=bottom,shape=straight": { "facing=north,half=bottom,shape=straight": {
"model": "new_soviet:block/separated_parquet_stairs", "model": "new_soviet:block/separated_oak_parquet_stairs",
"uvlock": true, "uvlock": true,
"y": 270 "y": 270
}, },
"facing=north,half=top,shape=inner_left": { "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, "uvlock": true,
"x": 180, "x": 180,
"y": 270 "y": 270
}, },
"facing=north,half=top,shape=inner_right": { "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, "uvlock": true,
"x": 180 "x": 180
}, },
"facing=north,half=top,shape=outer_left": { "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, "uvlock": true,
"x": 180, "x": 180,
"y": 270 "y": 270
}, },
"facing=north,half=top,shape=outer_right": { "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, "uvlock": true,
"x": 180 "x": 180
}, },
"facing=north,half=top,shape=straight": { "facing=north,half=top,shape=straight": {
"model": "new_soviet:block/separated_parquet_stairs", "model": "new_soviet:block/separated_oak_parquet_stairs",
"uvlock": true, "uvlock": true,
"x": 180, "x": 180,
"y": 270 "y": 270
}, },
"facing=south,half=bottom,shape=inner_left": { "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": { "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, "uvlock": true,
"y": 90 "y": 90
}, },
"facing=south,half=bottom,shape=outer_left": { "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": { "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, "uvlock": true,
"y": 90 "y": 90
}, },
"facing=south,half=bottom,shape=straight": { "facing=south,half=bottom,shape=straight": {
"model": "new_soviet:block/separated_parquet_stairs", "model": "new_soviet:block/separated_oak_parquet_stairs",
"uvlock": true, "uvlock": true,
"y": 90 "y": 90
}, },
"facing=south,half=top,shape=inner_left": { "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, "uvlock": true,
"x": 180, "x": 180,
"y": 90 "y": 90
}, },
"facing=south,half=top,shape=inner_right": { "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, "uvlock": true,
"x": 180, "x": 180,
"y": 180 "y": 180
}, },
"facing=south,half=top,shape=outer_left": { "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, "uvlock": true,
"x": 180, "x": 180,
"y": 90 "y": 90
}, },
"facing=south,half=top,shape=outer_right": { "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, "uvlock": true,
"x": 180, "x": 180,
"y": 180 "y": 180
}, },
"facing=south,half=top,shape=straight": { "facing=south,half=top,shape=straight": {
"model": "new_soviet:block/separated_parquet_stairs", "model": "new_soviet:block/separated_oak_parquet_stairs",
"uvlock": true, "uvlock": true,
"x": 180, "x": 180,
"y": 90 "y": 90
}, },
"facing=west,half=bottom,shape=inner_left": { "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, "uvlock": true,
"y": 90 "y": 90
}, },
"facing=west,half=bottom,shape=inner_right": { "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, "uvlock": true,
"y": 180 "y": 180
}, },
"facing=west,half=bottom,shape=outer_left": { "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, "uvlock": true,
"y": 90 "y": 90
}, },
"facing=west,half=bottom,shape=outer_right": { "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, "uvlock": true,
"y": 180 "y": 180
}, },
"facing=west,half=bottom,shape=straight": { "facing=west,half=bottom,shape=straight": {
"model": "new_soviet:block/separated_parquet_stairs", "model": "new_soviet:block/separated_oak_parquet_stairs",
"uvlock": true, "uvlock": true,
"y": 180 "y": 180
}, },
"facing=west,half=top,shape=inner_left": { "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, "uvlock": true,
"x": 180, "x": 180,
"y": 180 "y": 180
}, },
"facing=west,half=top,shape=inner_right": { "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, "uvlock": true,
"x": 180, "x": 180,
"y": 270 "y": 270
}, },
"facing=west,half=top,shape=outer_left": { "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, "uvlock": true,
"x": 180, "x": 180,
"y": 180 "y": 180
}, },
"facing=west,half=top,shape=outer_right": { "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, "uvlock": true,
"x": 180, "x": 180,
"y": 270 "y": 270
}, },
"facing=west,half=top,shape=straight": { "facing=west,half=top,shape=straight": {
"model": "new_soviet:block/separated_parquet_stairs", "model": "new_soviet:block/separated_oak_parquet_stairs",
"uvlock": true, "uvlock": true,
"x": 180, "x": 180,
"y": 180 "y": 180

7
src/main/generated/assets/new_soviet/blockstates/separated_parquet.json
View file

@ -1,7 +0,0 @@
{
"variants": {
"": {
"model": "new_soviet:block/separated_parquet"
}
}
}

13
src/main/generated/assets/new_soviet/blockstates/separated_parquet_slab.json
View file

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

7
src/main/generated/assets/new_soviet/blockstates/straight_oak_parquet.json Normal file
View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "new_soviet:block/straight_oak_parquet"
}
}
}

13
src/main/generated/assets/new_soviet/blockstates/straight_oak_parquet_slab.json Normal file
View file

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

80
src/main/generated/assets/new_soviet/blockstates/straight_parquet_stairs.json → src/main/generated/assets/new_soviet/blockstates/straight_oak_parquet_stairs.json
View file

@ -1,206 +1,206 @@
{ {
"variants": { "variants": {
"facing=east,half=bottom,shape=inner_left": { "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, "uvlock": true,
"y": 270 "y": 270
}, },
"facing=east,half=bottom,shape=inner_right": { "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": { "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, "uvlock": true,
"y": 270 "y": 270
}, },
"facing=east,half=bottom,shape=outer_right": { "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": { "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": { "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, "uvlock": true,
"x": 180 "x": 180
}, },
"facing=east,half=top,shape=inner_right": { "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, "uvlock": true,
"x": 180, "x": 180,
"y": 90 "y": 90
}, },
"facing=east,half=top,shape=outer_left": { "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, "uvlock": true,
"x": 180 "x": 180
}, },
"facing=east,half=top,shape=outer_right": { "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, "uvlock": true,
"x": 180, "x": 180,
"y": 90 "y": 90
}, },
"facing=east,half=top,shape=straight": { "facing=east,half=top,shape=straight": {
"model": "new_soviet:block/straight_parquet_stairs", "model": "new_soviet:block/straight_oak_parquet_stairs",
"uvlock": true, "uvlock": true,
"x": 180 "x": 180
}, },
"facing=north,half=bottom,shape=inner_left": { "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, "uvlock": true,
"y": 180 "y": 180
}, },
"facing=north,half=bottom,shape=inner_right": { "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, "uvlock": true,
"y": 270 "y": 270
}, },
"facing=north,half=bottom,shape=outer_left": { "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, "uvlock": true,
"y": 180 "y": 180
}, },
"facing=north,half=bottom,shape=outer_right": { "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, "uvlock": true,
"y": 270 "y": 270
}, },
"facing=north,half=bottom,shape=straight": { "facing=north,half=bottom,shape=straight": {
"model": "new_soviet:block/straight_parquet_stairs", "model": "new_soviet:block/straight_oak_parquet_stairs",
"uvlock": true, "uvlock": true,
"y": 270 "y": 270
}, },
"facing=north,half=top,shape=inner_left": { "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, "uvlock": true,
"x": 180, "x": 180,
"y": 270 "y": 270
}, },
"facing=north,half=top,shape=inner_right": { "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, "uvlock": true,
"x": 180 "x": 180
}, },
"facing=north,half=top,shape=outer_left": { "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, "uvlock": true,
"x": 180, "x": 180,
"y": 270 "y": 270
}, },
"facing=north,half=top,shape=outer_right": { "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, "uvlock": true,
"x": 180 "x": 180
}, },
"facing=north,half=top,shape=straight": { "facing=north,half=top,shape=straight": {
"model": "new_soviet:block/straight_parquet_stairs", "model": "new_soviet:block/straight_oak_parquet_stairs",
"uvlock": true, "uvlock": true,
"x": 180, "x": 180,
"y": 270 "y": 270
}, },
"facing=south,half=bottom,shape=inner_left": { "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": { "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, "uvlock": true,
"y": 90 "y": 90
}, },
"facing=south,half=bottom,shape=outer_left": { "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": { "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, "uvlock": true,
"y": 90 "y": 90
}, },
"facing=south,half=bottom,shape=straight": { "facing=south,half=bottom,shape=straight": {
"model": "new_soviet:block/straight_parquet_stairs", "model": "new_soviet:block/straight_oak_parquet_stairs",
"uvlock": true, "uvlock": true,
"y": 90 "y": 90
}, },
"facing=south,half=top,shape=inner_left": { "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, "uvlock": true,
"x": 180, "x": 180,
"y": 90 "y": 90
}, },
"facing=south,half=top,shape=inner_right": { "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, "uvlock": true,
"x": 180, "x": 180,
"y": 180 "y": 180
}, },
"facing=south,half=top,shape=outer_left": { "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, "uvlock": true,
"x": 180, "x": 180,
"y": 90 "y": 90
}, },
"facing=south,half=top,shape=outer_right": { "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, "uvlock": true,
"x": 180, "x": 180,
"y": 180 "y": 180
}, },
"facing=south,half=top,shape=straight": { "facing=south,half=top,shape=straight": {
"model": "new_soviet:block/straight_parquet_stairs", "model": "new_soviet:block/straight_oak_parquet_stairs",
"uvlock": true, "uvlock": true,
"x": 180, "x": 180,
"y": 90 "y": 90
}, },
"facing=west,half=bottom,shape=inner_left": { "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, "uvlock": true,
"y": 90 "y": 90
}, },
"facing=west,half=bottom,shape=inner_right": { "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, "uvlock": true,
"y": 180 "y": 180
}, },
"facing=west,half=bottom,shape=outer_left": { "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, "uvlock": true,
"y": 90 "y": 90
}, },
"facing=west,half=bottom,shape=outer_right": { "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, "uvlock": true,
"y": 180 "y": 180
}, },
"facing=west,half=bottom,shape=straight": { "facing=west,half=bottom,shape=straight": {
"model": "new_soviet:block/straight_parquet_stairs", "model": "new_soviet:block/straight_oak_parquet_stairs",
"uvlock": true, "uvlock": true,
"y": 180 "y": 180
}, },
"facing=west,half=top,shape=inner_left": { "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, "uvlock": true,
"x": 180, "x": 180,
"y": 180 "y": 180
}, },
"facing=west,half=top,shape=inner_right": { "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, "uvlock": true,
"x": 180, "x": 180,
"y": 270 "y": 270
}, },
"facing=west,half=top,shape=outer_left": { "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, "uvlock": true,
"x": 180, "x": 180,
"y": 180 "y": 180
}, },
"facing=west,half=top,shape=outer_right": { "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, "uvlock": true,
"x": 180, "x": 180,
"y": 270 "y": 270
}, },
"facing=west,half=top,shape=straight": { "facing=west,half=top,shape=straight": {
"model": "new_soviet:block/straight_parquet_stairs", "model": "new_soviet:block/straight_oak_parquet_stairs",
"uvlock": true, "uvlock": true,
"x": 180, "x": 180,
"y": 180 "y": 180

7
src/main/generated/assets/new_soviet/blockstates/straight_parquet.json
View file

@ -1,7 +0,0 @@
{
"variants": {
"": {
"model": "new_soviet:block/straight_parquet"
}
}
}

13
src/main/generated/assets/new_soviet/blockstates/straight_parquet_slab.json
View file

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

6
src/main/generated/assets/new_soviet/models/block/separated_oak_parquet.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/floor/planks/separated_oak_parquet"
}
}

8
src/main/generated/assets/new_soviet/models/block/separated_oak_parquet_slab.json Normal file
View file

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

8
src/main/generated/assets/new_soviet/models/block/separated_oak_parquet_slab_top.json Normal file
View file

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

8
src/main/generated/assets/new_soviet/models/block/separated_oak_parquet_stairs.json Normal file
View file

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

8
src/main/generated/assets/new_soviet/models/block/separated_oak_parquet_stairs_inner.json Normal file
View file

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

8
src/main/generated/assets/new_soviet/models/block/separated_oak_parquet_stairs_outer.json Normal file
View file

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

6
src/main/generated/assets/new_soviet/models/block/separated_parquet.json
View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/floor/planks/separated_parquet"
}
}

8
src/main/generated/assets/new_soviet/models/block/separated_parquet_slab.json
View file

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

8
src/main/generated/assets/new_soviet/models/block/separated_parquet_slab_top.json
View file

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

8
src/main/generated/assets/new_soviet/models/block/separated_parquet_stairs.json
View file

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

8
src/main/generated/assets/new_soviet/models/block/separated_parquet_stairs_inner.json
View file

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

8
src/main/generated/assets/new_soviet/models/block/separated_parquet_stairs_outer.json
View file

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

6
src/main/generated/assets/new_soviet/models/block/straight_oak_parquet.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/floor/planks/straight_oak_parquet"
}
}

8
src/main/generated/assets/new_soviet/models/block/straight_oak_parquet_slab.json Normal file
View file

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

8
src/main/generated/assets/new_soviet/models/block/straight_oak_parquet_slab_top.json Normal file
View file

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

8
src/main/generated/assets/new_soviet/models/block/straight_oak_parquet_stairs.json Normal file
View file

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

8
src/main/generated/assets/new_soviet/models/block/straight_oak_parquet_stairs_inner.json Normal file
View file

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

8
src/main/generated/assets/new_soviet/models/block/straight_oak_parquet_stairs_outer.json Normal file
View file

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

6
src/main/generated/assets/new_soviet/models/block/straight_parquet.json
View file

@ -1,6 +0,0 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "new_soviet:block/floor/planks/straight_parquet"
}
}

8
src/main/generated/assets/new_soviet/models/block/straight_parquet_slab.json
View file

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

8
src/main/generated/assets/new_soviet/models/block/straight_parquet_slab_top.json
View file

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

8
src/main/generated/assets/new_soviet/models/block/straight_parquet_stairs.json
View file

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

8
src/main/generated/assets/new_soviet/models/block/straight_parquet_stairs_inner.json
View file

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

8
src/main/generated/assets/new_soviet/models/block/straight_parquet_stairs_outer.json
View file

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

3
src/main/generated/assets/new_soviet/models/item/separated_oak_parquet.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "new_soviet:block/separated_oak_parquet"
}

3
src/main/generated/assets/new_soviet/models/item/separated_oak_parquet_slab.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "new_soviet:block/separated_oak_parquet_slab"
}

3
src/main/generated/assets/new_soviet/models/item/separated_oak_parquet_stairs.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "new_soviet:block/separated_oak_parquet_stairs"
}

3
src/main/generated/assets/new_soviet/models/item/separated_parquet.json
View file

@ -1,3 +0,0 @@
{
"parent": "new_soviet:block/separated_parquet"
}

3
src/main/generated/assets/new_soviet/models/item/separated_parquet_slab.json
View file

@ -1,3 +0,0 @@
{
"parent": "new_soviet:block/separated_parquet_slab"
}

3
src/main/generated/assets/new_soviet/models/item/separated_parquet_stairs.json
View file

@ -1,3 +0,0 @@
{
"parent": "new_soviet:block/separated_parquet_stairs"
}

3
src/main/generated/assets/new_soviet/models/item/straight_oak_parquet.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "new_soviet:block/straight_oak_parquet"
}

3
src/main/generated/assets/new_soviet/models/item/straight_oak_parquet_slab.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "new_soviet:block/straight_oak_parquet_slab"
}

3
src/main/generated/assets/new_soviet/models/item/straight_oak_parquet_stairs.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "new_soviet:block/straight_oak_parquet_stairs"
}

3
src/main/generated/assets/new_soviet/models/item/straight_parquet.json
View file

@ -1,3 +0,0 @@
{
"parent": "new_soviet:block/straight_parquet"
}

3
src/main/generated/assets/new_soviet/models/item/straight_parquet_slab.json
View file

@ -1,3 +0,0 @@
{
"parent": "new_soviet:block/straight_parquet_slab"
}

3
src/main/generated/assets/new_soviet/models/item/straight_parquet_stairs.json
View file

@ -1,3 +0,0 @@
{
"parent": "new_soviet:block/straight_parquet_stairs"
}

12
src/main/generated/data/minecraft/tags/blocks/mineable/axe.json
View file

@ -22,8 +22,8 @@
"new_soviet:herringbone_spruce_planks", "new_soviet:herringbone_spruce_planks",
"new_soviet:cross_spruce_planks", "new_soviet:cross_spruce_planks",
"new_soviet:herringbone_dark_oak_parquet", "new_soviet:herringbone_dark_oak_parquet",
"new_soviet:straight_parquet", "new_soviet:straight_oak_parquet",
"new_soviet:separated_parquet", "new_soviet:separated_oak_parquet",
"new_soviet:green_linoleum", "new_soviet:green_linoleum",
"new_soviet:blue_linoleum", "new_soviet:blue_linoleum",
"new_soviet:red_linoleum", "new_soviet:red_linoleum",
@ -78,10 +78,10 @@
"new_soviet:cross_spruce_planks_slab", "new_soviet:cross_spruce_planks_slab",
"new_soviet:herringbone_dark_oak_parquet_stairs", "new_soviet:herringbone_dark_oak_parquet_stairs",
"new_soviet:herringbone_dark_oak_parquet_slab", "new_soviet:herringbone_dark_oak_parquet_slab",
"new_soviet:straight_parquet_stairs", "new_soviet:straight_oak_parquet_stairs",
"new_soviet:straight_parquet_slab", "new_soviet:straight_oak_parquet_slab",
"new_soviet:separated_parquet_stairs", "new_soviet:separated_oak_parquet_stairs",
"new_soviet:separated_parquet_slab", "new_soviet:separated_oak_parquet_slab",
"new_soviet:green_linoleum_stairs", "new_soviet:green_linoleum_stairs",
"new_soviet:green_linoleum_slab", "new_soviet:green_linoleum_slab",
"new_soviet:blue_linoleum_stairs", "new_soviet:blue_linoleum_stairs",

4
src/main/generated/data/minecraft/tags/blocks/slabs.json
View file

@ -95,8 +95,8 @@
"new_soviet:herringbone_spruce_planks_slab", "new_soviet:herringbone_spruce_planks_slab",
"new_soviet:cross_spruce_planks_slab", "new_soviet:cross_spruce_planks_slab",
"new_soviet:herringbone_dark_oak_parquet_slab", "new_soviet:herringbone_dark_oak_parquet_slab",
"new_soviet:straight_parquet_slab", "new_soviet:straight_oak_parquet_slab",
"new_soviet:separated_parquet_slab", "new_soviet:separated_oak_parquet_slab",
"new_soviet:green_linoleum_slab", "new_soviet:green_linoleum_slab",
"new_soviet:blue_linoleum_slab", "new_soviet:blue_linoleum_slab",
"new_soviet:red_linoleum_slab", "new_soviet:red_linoleum_slab",

4
src/main/generated/data/minecraft/tags/blocks/stairs.json
View file

@ -95,8 +95,8 @@
"new_soviet:herringbone_spruce_planks_stairs", "new_soviet:herringbone_spruce_planks_stairs",
"new_soviet:cross_spruce_planks_stairs", "new_soviet:cross_spruce_planks_stairs",
"new_soviet:herringbone_dark_oak_parquet_stairs", "new_soviet:herringbone_dark_oak_parquet_stairs",
"new_soviet:straight_parquet_stairs", "new_soviet:straight_oak_parquet_stairs",
"new_soviet:separated_parquet_stairs", "new_soviet:separated_oak_parquet_stairs",
"new_soviet:green_linoleum_stairs", "new_soviet:green_linoleum_stairs",
"new_soviet:blue_linoleum_stairs", "new_soviet:blue_linoleum_stairs",
"new_soviet:red_linoleum_stairs", "new_soviet:red_linoleum_stairs",

6
src/main/generated/data/minecraft/tags/items/music_discs.json Normal file
View file

@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"new_soviet:music_disc_ussr_anthem"
]
}

4
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_parquet_from_oak_planks_stonecutting.json → src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_oak_parquet_from_oak_planks_stonecutting.json
View file

@ -15,7 +15,7 @@
}, },
"has_the_recipe": { "has_the_recipe": {
"conditions": { "conditions": {
"recipe": "minecraft:straight_parquet_from_oak_planks_stonecutting" "recipe": "minecraft:separated_oak_parquet_from_oak_planks_stonecutting"
}, },
"trigger": "minecraft:recipe_unlocked" "trigger": "minecraft:recipe_unlocked"
} }
@ -28,7 +28,7 @@
], ],
"rewards": { "rewards": {
"recipes": [ "recipes": [
"minecraft:straight_parquet_from_oak_planks_stonecutting" "minecraft:separated_oak_parquet_from_oak_planks_stonecutting"
] ]
}, },
"sends_telemetry_event": false "sends_telemetry_event": false

10
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_parquet_stairs.json → src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_oak_parquet_slab.json
View file

@ -1,12 +1,12 @@
{ {
"parent": "minecraft:recipes/root", "parent": "minecraft:recipes/root",
"criteria": { "criteria": {
"has_straight_parquet": { "has_separated_oak_parquet": {
"conditions": { "conditions": {
"items": [ "items": [
{ {
"items": [ "items": [
"new_soviet:straight_parquet" "new_soviet:separated_oak_parquet"
] ]
} }
] ]
@ -15,20 +15,20 @@
}, },
"has_the_recipe": { "has_the_recipe": {
"conditions": { "conditions": {
"recipe": "new_soviet:straight_parquet_stairs" "recipe": "new_soviet:separated_oak_parquet_slab"
}, },
"trigger": "minecraft:recipe_unlocked" "trigger": "minecraft:recipe_unlocked"
} }
}, },
"requirements": [ "requirements": [
[ [
"has_straight_parquet", "has_separated_oak_parquet",
"has_the_recipe" "has_the_recipe"
] ]
], ],
"rewards": { "rewards": {
"recipes": [ "recipes": [
"new_soviet:straight_parquet_stairs" "new_soviet:separated_oak_parquet_slab"
] ]
}, },
"sends_telemetry_event": false "sends_telemetry_event": false

35
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_oak_parquet_slab_from_separated_oak_parquet_stonecutting.json Normal file
View file

@ -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
}

10
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_parquet_stairs.json → src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_oak_parquet_stairs.json
View file

@ -1,12 +1,12 @@
{ {
"parent": "minecraft:recipes/root", "parent": "minecraft:recipes/root",
"criteria": { "criteria": {
"has_separated_parquet": { "has_separated_oak_parquet": {
"conditions": { "conditions": {
"items": [ "items": [
{ {
"items": [ "items": [
"new_soviet:separated_parquet" "new_soviet:separated_oak_parquet"
] ]
} }
] ]
@ -15,20 +15,20 @@
}, },
"has_the_recipe": { "has_the_recipe": {
"conditions": { "conditions": {
"recipe": "new_soviet:separated_parquet_stairs" "recipe": "new_soviet:separated_oak_parquet_stairs"
}, },
"trigger": "minecraft:recipe_unlocked" "trigger": "minecraft:recipe_unlocked"
} }
}, },
"requirements": [ "requirements": [
[ [
"has_separated_parquet", "has_separated_oak_parquet",
"has_the_recipe" "has_the_recipe"
] ]
], ],
"rewards": { "rewards": {
"recipes": [ "recipes": [
"new_soviet:separated_parquet_stairs" "new_soviet:separated_oak_parquet_stairs"
] ]
}, },
"sends_telemetry_event": false "sends_telemetry_event": false

10
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_parquet_slab_from_straight_parquet_stonecutting.json → src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_oak_parquet_stairs_from_separated_oak_parquet_stonecutting.json
View file

@ -1,12 +1,12 @@
{ {
"parent": "minecraft:recipes/root", "parent": "minecraft:recipes/root",
"criteria": { "criteria": {
"has_straight_parquet": { "has_separated_oak_parquet": {
"conditions": { "conditions": {
"items": [ "items": [
{ {
"items": [ "items": [
"new_soviet:straight_parquet" "new_soviet:separated_oak_parquet"
] ]
} }
] ]
@ -15,20 +15,20 @@
}, },
"has_the_recipe": { "has_the_recipe": {
"conditions": { "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" "trigger": "minecraft:recipe_unlocked"
} }
}, },
"requirements": [ "requirements": [
[ [
"has_straight_parquet", "has_separated_oak_parquet",
"has_the_recipe" "has_the_recipe"
] ]
], ],
"rewards": { "rewards": {
"recipes": [ "recipes": [
"minecraft:straight_parquet_slab_from_straight_parquet_stonecutting" "minecraft:separated_oak_parquet_stairs_from_separated_oak_parquet_stonecutting"
] ]
}, },
"sends_telemetry_event": false "sends_telemetry_event": false

35
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_parquet_stairs_from_separated_parquet_stonecutting.json
View file

@ -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
}

4
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_parquet_from_oak_planks_stonecutting.json → src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_oak_parquet_from_oak_planks_stonecutting.json
View file

@ -15,7 +15,7 @@
}, },
"has_the_recipe": { "has_the_recipe": {
"conditions": { "conditions": {
"recipe": "minecraft:separated_parquet_from_oak_planks_stonecutting" "recipe": "minecraft:straight_oak_parquet_from_oak_planks_stonecutting"
}, },
"trigger": "minecraft:recipe_unlocked" "trigger": "minecraft:recipe_unlocked"
} }
@ -28,7 +28,7 @@
], ],
"rewards": { "rewards": {
"recipes": [ "recipes": [
"minecraft:separated_parquet_from_oak_planks_stonecutting" "minecraft:straight_oak_parquet_from_oak_planks_stonecutting"
] ]
}, },
"sends_telemetry_event": false "sends_telemetry_event": false

10
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_parquet_slab.json → src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_oak_parquet_slab.json
View file

@ -1,12 +1,12 @@
{ {
"parent": "minecraft:recipes/root", "parent": "minecraft:recipes/root",
"criteria": { "criteria": {
"has_straight_parquet": { "has_straight_oak_parquet": {
"conditions": { "conditions": {
"items": [ "items": [
{ {
"items": [ "items": [
"new_soviet:straight_parquet" "new_soviet:straight_oak_parquet"
] ]
} }
] ]
@ -15,20 +15,20 @@
}, },
"has_the_recipe": { "has_the_recipe": {
"conditions": { "conditions": {
"recipe": "new_soviet:straight_parquet_slab" "recipe": "new_soviet:straight_oak_parquet_slab"
}, },
"trigger": "minecraft:recipe_unlocked" "trigger": "minecraft:recipe_unlocked"
} }
}, },
"requirements": [ "requirements": [
[ [
"has_straight_parquet", "has_straight_oak_parquet",
"has_the_recipe" "has_the_recipe"
] ]
], ],
"rewards": { "rewards": {
"recipes": [ "recipes": [
"new_soviet:straight_parquet_slab" "new_soviet:straight_oak_parquet_slab"
] ]
}, },
"sends_telemetry_event": false "sends_telemetry_event": false

10
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_parquet_slab_from_separated_parquet_stonecutting.json → src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_oak_parquet_slab_from_straight_oak_parquet_stonecutting.json
View file

@ -1,12 +1,12 @@
{ {
"parent": "minecraft:recipes/root", "parent": "minecraft:recipes/root",
"criteria": { "criteria": {
"has_separated_parquet": { "has_straight_oak_parquet": {
"conditions": { "conditions": {
"items": [ "items": [
{ {
"items": [ "items": [
"new_soviet:separated_parquet" "new_soviet:straight_oak_parquet"
] ]
} }
] ]
@ -15,20 +15,20 @@
}, },
"has_the_recipe": { "has_the_recipe": {
"conditions": { "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" "trigger": "minecraft:recipe_unlocked"
} }
}, },
"requirements": [ "requirements": [
[ [
"has_separated_parquet", "has_straight_oak_parquet",
"has_the_recipe" "has_the_recipe"
] ]
], ],
"rewards": { "rewards": {
"recipes": [ "recipes": [
"minecraft:separated_parquet_slab_from_separated_parquet_stonecutting" "minecraft:straight_oak_parquet_slab_from_straight_oak_parquet_stonecutting"
] ]
}, },
"sends_telemetry_event": false "sends_telemetry_event": false

10
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/separated_parquet_slab.json → src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_oak_parquet_stairs.json
View file

@ -1,12 +1,12 @@
{ {
"parent": "minecraft:recipes/root", "parent": "minecraft:recipes/root",
"criteria": { "criteria": {
"has_separated_parquet": { "has_straight_oak_parquet": {
"conditions": { "conditions": {
"items": [ "items": [
{ {
"items": [ "items": [
"new_soviet:separated_parquet" "new_soviet:straight_oak_parquet"
] ]
} }
] ]
@ -15,20 +15,20 @@
}, },
"has_the_recipe": { "has_the_recipe": {
"conditions": { "conditions": {
"recipe": "new_soviet:separated_parquet_slab" "recipe": "new_soviet:straight_oak_parquet_stairs"
}, },
"trigger": "minecraft:recipe_unlocked" "trigger": "minecraft:recipe_unlocked"
} }
}, },
"requirements": [ "requirements": [
[ [
"has_separated_parquet", "has_straight_oak_parquet",
"has_the_recipe" "has_the_recipe"
] ]
], ],
"rewards": { "rewards": {
"recipes": [ "recipes": [
"new_soviet:separated_parquet_slab" "new_soviet:straight_oak_parquet_stairs"
] ]
}, },
"sends_telemetry_event": false "sends_telemetry_event": false

35
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_oak_parquet_stairs_from_straight_oak_parquet_stonecutting.json Normal file
View file

@ -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
}

35
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/straight_parquet_stairs_from_straight_parquet_stonecutting.json
View file

@ -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
}

2
src/main/generated/data/new_soviet/loot_tables/blocks/straight_parquet_slab.json → src/main/generated/data/new_soviet/loot_tables/blocks/separated_oak_parquet.json
View file

@ -11,7 +11,7 @@
"entries": [ "entries": [
{ {
"type": "minecraft:item", "type": "minecraft:item",
"name": "new_soviet:straight_parquet_slab" "name": "new_soviet:separated_oak_parquet"
} }
], ],
"rolls": 1.0 "rolls": 1.0

2
src/main/generated/data/new_soviet/loot_tables/blocks/separated_parquet_slab.json → src/main/generated/data/new_soviet/loot_tables/blocks/separated_oak_parquet_slab.json
View file

@ -11,7 +11,7 @@
"entries": [ "entries": [
{ {
"type": "minecraft:item", "type": "minecraft:item",
"name": "new_soviet:separated_parquet_slab" "name": "new_soviet:separated_oak_parquet_slab"
} }
], ],
"rolls": 1.0 "rolls": 1.0

20
src/main/generated/data/new_soviet/loot_tables/blocks/separated_oak_parquet_stairs.json Normal file
View file

@ -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
}
]
}

2
src/main/generated/data/new_soviet/loot_tables/blocks/straight_parquet.json → src/main/generated/data/new_soviet/loot_tables/blocks/straight_oak_parquet.json
View file

@ -11,7 +11,7 @@
"entries": [ "entries": [
{ {
"type": "minecraft:item", "type": "minecraft:item",
"name": "new_soviet:straight_parquet" "name": "new_soviet:straight_oak_parquet"
} }
], ],
"rolls": 1.0 "rolls": 1.0

2
src/main/generated/data/new_soviet/loot_tables/blocks/separated_parquet_stairs.json → src/main/generated/data/new_soviet/loot_tables/blocks/straight_oak_parquet_slab.json
View file

@ -11,7 +11,7 @@
"entries": [ "entries": [
{ {
"type": "minecraft:item", "type": "minecraft:item",
"name": "new_soviet:separated_parquet_stairs" "name": "new_soviet:straight_oak_parquet_slab"
} }
], ],
"rolls": 1.0 "rolls": 1.0

2
src/main/generated/data/new_soviet/loot_tables/blocks/separated_parquet.json → src/main/generated/data/new_soviet/loot_tables/blocks/straight_oak_parquet_stairs.json
View file

@ -11,7 +11,7 @@
"entries": [ "entries": [
{ {
"type": "minecraft:item", "type": "minecraft:item",
"name": "new_soviet:separated_parquet" "name": "new_soviet:straight_oak_parquet_stairs"
} }
], ],
"rolls": 1.0 "rolls": 1.0

20
src/main/generated/data/new_soviet/loot_tables/blocks/straight_parquet_stairs.json
View file

@ -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
}
]
}

2
src/main/generated/data/new_soviet/recipes/straight_parquet_from_oak_planks_stonecutting.json → src/main/generated/data/new_soviet/recipes/separated_oak_parquet_from_oak_planks_stonecutting.json
View file

@ -4,5 +4,5 @@
"ingredient": { "ingredient": {
"item": "minecraft:oak_planks" "item": "minecraft:oak_planks"
}, },
"result": "new_soviet:straight_parquet" "result": "new_soviet:separated_oak_parquet"
} }

4
src/main/generated/data/new_soviet/recipes/separated_parquet_slab.json → src/main/generated/data/new_soviet/recipes/separated_oak_parquet_slab.json
View file

@ -3,7 +3,7 @@
"category": "building", "category": "building",
"key": { "key": {
"#": { "#": {
"item": "new_soviet:separated_parquet" "item": "new_soviet:separated_oak_parquet"
} }
}, },
"pattern": [ "pattern": [
@ -11,7 +11,7 @@
], ],
"result": { "result": {
"count": 6, "count": 6,
"item": "new_soviet:separated_parquet_slab" "item": "new_soviet:separated_oak_parquet_slab"
}, },
"show_notification": true "show_notification": true
} }

8
src/main/generated/data/new_soviet/recipes/separated_oak_parquet_slab_from_separated_oak_parquet_stonecutting.json Normal file
View file

@ -0,0 +1,8 @@
{
"type": "minecraft:stonecutting",
"count": 1,
"ingredient": {
"item": "new_soviet:separated_oak_parquet"
},
"result": "new_soviet:separated_oak_parquet_slab"
}

4
src/main/generated/data/new_soviet/recipes/separated_parquet_stairs.json → src/main/generated/data/new_soviet/recipes/separated_oak_parquet_stairs.json
View file

@ -3,7 +3,7 @@
"category": "building", "category": "building",
"key": { "key": {
"#": { "#": {
"item": "new_soviet:separated_parquet" "item": "new_soviet:separated_oak_parquet"
} }
}, },
"pattern": [ "pattern": [
@ -13,7 +13,7 @@
], ],
"result": { "result": {
"count": 4, "count": 4,
"item": "new_soviet:separated_parquet_stairs" "item": "new_soviet:separated_oak_parquet_stairs"
}, },
"show_notification": true "show_notification": true
} }

8
src/main/generated/data/new_soviet/recipes/separated_oak_parquet_stairs_from_separated_oak_parquet_stonecutting.json Normal file
View file

@ -0,0 +1,8 @@
{
"type": "minecraft:stonecutting",
"count": 1,
"ingredient": {
"item": "new_soviet:separated_oak_parquet"
},
"result": "new_soviet:separated_oak_parquet_stairs"
}

8
src/main/generated/data/new_soviet/recipes/separated_parquet_slab_from_separated_parquet_stonecutting.json
View file

@ -1,8 +0,0 @@
{
"type": "minecraft:stonecutting",
"count": 1,
"ingredient": {
"item": "new_soviet:separated_parquet"
},
"result": "new_soviet:separated_parquet_slab"
}

8
src/main/generated/data/new_soviet/recipes/separated_parquet_stairs_from_separated_parquet_stonecutting.json
View file

@ -1,8 +0,0 @@
{
"type": "minecraft:stonecutting",
"count": 1,
"ingredient": {
"item": "new_soviet:separated_parquet"
},
"result": "new_soviet:separated_parquet_stairs"
}

2
src/main/generated/data/new_soviet/recipes/separated_parquet_from_oak_planks_stonecutting.json → src/main/generated/data/new_soviet/recipes/straight_oak_parquet_from_oak_planks_stonecutting.json
View file

@ -4,5 +4,5 @@
"ingredient": { "ingredient": {
"item": "minecraft:oak_planks" "item": "minecraft:oak_planks"
}, },
"result": "new_soviet:separated_parquet" "result": "new_soviet:straight_oak_parquet"
} }

4
src/main/generated/data/new_soviet/recipes/straight_parquet_slab.json → src/main/generated/data/new_soviet/recipes/straight_oak_parquet_slab.json
View file

@ -3,7 +3,7 @@
"category": "building", "category": "building",
"key": { "key": {
"#": { "#": {
"item": "new_soviet:straight_parquet" "item": "new_soviet:straight_oak_parquet"
} }
}, },
"pattern": [ "pattern": [
@ -11,7 +11,7 @@
], ],
"result": { "result": {
"count": 6, "count": 6,
"item": "new_soviet:straight_parquet_slab" "item": "new_soviet:straight_oak_parquet_slab"
}, },
"show_notification": true "show_notification": true
} }

8
src/main/generated/data/new_soviet/recipes/straight_oak_parquet_slab_from_straight_oak_parquet_stonecutting.json Normal file
View file

@ -0,0 +1,8 @@
{
"type": "minecraft:stonecutting",
"count": 1,
"ingredient": {
"item": "new_soviet:straight_oak_parquet"
},
"result": "new_soviet:straight_oak_parquet_slab"
}

4
src/main/generated/data/new_soviet/recipes/straight_parquet_stairs.json → src/main/generated/data/new_soviet/recipes/straight_oak_parquet_stairs.json
View file

@ -3,7 +3,7 @@
"category": "building", "category": "building",
"key": { "key": {
"#": { "#": {
"item": "new_soviet:straight_parquet" "item": "new_soviet:straight_oak_parquet"
} }
}, },
"pattern": [ "pattern": [
@ -13,7 +13,7 @@
], ],
"result": { "result": {
"count": 4, "count": 4,
"item": "new_soviet:straight_parquet_stairs" "item": "new_soviet:straight_oak_parquet_stairs"
}, },
"show_notification": true "show_notification": true
} }

8
src/main/generated/data/new_soviet/recipes/straight_oak_parquet_stairs_from_straight_oak_parquet_stonecutting.json Normal file
View file

@ -0,0 +1,8 @@
{
"type": "minecraft:stonecutting",
"count": 1,
"ingredient": {
"item": "new_soviet:straight_oak_parquet"
},
"result": "new_soviet:straight_oak_parquet_stairs"
}

8
src/main/generated/data/new_soviet/recipes/straight_parquet_slab_from_straight_parquet_stonecutting.json
View file

@ -1,8 +0,0 @@
{
"type": "minecraft:stonecutting",
"count": 1,
"ingredient": {
"item": "new_soviet:straight_parquet"
},
"result": "new_soviet:straight_parquet_slab"
}

8
src/main/generated/data/new_soviet/recipes/straight_parquet_stairs_from_straight_parquet_stonecutting.json
View file

@ -1,8 +0,0 @@
{
"type": "minecraft:stonecutting",
"count": 1,
"ingredient": {
"item": "new_soviet:straight_parquet"
},
"result": "new_soviet:straight_parquet_stairs"
}

12
src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java
View file

@ -154,8 +154,8 @@ public class BlockLootTables extends FabricBlockLootTableProvider {
addDrop(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS); addDrop(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS);
addDrop(NSE_Blocks.CROSS_SPRUCE_PLANKS); addDrop(NSE_Blocks.CROSS_SPRUCE_PLANKS);
addDrop(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET); addDrop(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET);
addDrop(NSE_Blocks.STRAIGHT_PARQUET); addDrop(NSE_Blocks.STRAIGHT_OAK_PARQUET);
addDrop(NSE_Blocks.SEPARATED_PARQUET); addDrop(NSE_Blocks.SEPARATED_OAK_PARQUET);
addDrop(NSE_Blocks.GREEN_LINOLEUM); addDrop(NSE_Blocks.GREEN_LINOLEUM);
addDrop(NSE_Blocks.BLUE_LINOLEUM); addDrop(NSE_Blocks.BLUE_LINOLEUM);
addDrop(NSE_Blocks.RED_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.CROSS_SPRUCE_PLANKS_STAIRS);
addDrop(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_SLAB); addDrop(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_SLAB);
addDrop(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_STAIRS); addDrop(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_STAIRS);
addDrop(NSE_Blocks.STRAIGHT_PARQUET_SLAB); addDrop(NSE_Blocks.STRAIGHT_OAK_PARQUET_SLAB);
addDrop(NSE_Blocks.STRAIGHT_PARQUET_STAIRS); addDrop(NSE_Blocks.STRAIGHT_OAK_PARQUET_STAIRS);
addDrop(NSE_Blocks.SEPARATED_PARQUET_SLAB); addDrop(NSE_Blocks.SEPARATED_OAK_PARQUET_SLAB);
addDrop(NSE_Blocks.SEPARATED_PARQUET_STAIRS); addDrop(NSE_Blocks.SEPARATED_OAK_PARQUET_STAIRS);
addDrop(NSE_Blocks.GREEN_LINOLEUM_SLAB); addDrop(NSE_Blocks.GREEN_LINOLEUM_SLAB);
addDrop(NSE_Blocks.GREEN_LINOLEUM_STAIRS); addDrop(NSE_Blocks.GREEN_LINOLEUM_STAIRS);
addDrop(NSE_Blocks.BLUE_LINOLEUM_SLAB); addDrop(NSE_Blocks.BLUE_LINOLEUM_SLAB);

20
src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java
View file

@ -364,8 +364,8 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider {
.add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS) .add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS)
.add(NSE_Blocks.CROSS_SPRUCE_PLANKS) .add(NSE_Blocks.CROSS_SPRUCE_PLANKS)
.add(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET) .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET)
.add(NSE_Blocks.STRAIGHT_PARQUET) .add(NSE_Blocks.STRAIGHT_OAK_PARQUET)
.add(NSE_Blocks.SEPARATED_PARQUET) .add(NSE_Blocks.SEPARATED_OAK_PARQUET)
.add(NSE_Blocks.GREEN_LINOLEUM) .add(NSE_Blocks.GREEN_LINOLEUM)
.add(NSE_Blocks.BLUE_LINOLEUM) .add(NSE_Blocks.BLUE_LINOLEUM)
.add(NSE_Blocks.RED_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.CROSS_SPRUCE_PLANKS_SLAB)
.add(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_STAIRS) .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_STAIRS)
.add(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_SLAB) .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_SLAB)
.add(NSE_Blocks.STRAIGHT_PARQUET_STAIRS) .add(NSE_Blocks.STRAIGHT_OAK_PARQUET_STAIRS)
.add(NSE_Blocks.STRAIGHT_PARQUET_SLAB) .add(NSE_Blocks.STRAIGHT_OAK_PARQUET_SLAB)
.add(NSE_Blocks.SEPARATED_PARQUET_STAIRS) .add(NSE_Blocks.SEPARATED_OAK_PARQUET_STAIRS)
.add(NSE_Blocks.SEPARATED_PARQUET_SLAB) .add(NSE_Blocks.SEPARATED_OAK_PARQUET_SLAB)
.add(NSE_Blocks.GREEN_LINOLEUM_STAIRS) .add(NSE_Blocks.GREEN_LINOLEUM_STAIRS)
.add(NSE_Blocks.GREEN_LINOLEUM_SLAB) .add(NSE_Blocks.GREEN_LINOLEUM_SLAB)
.add(NSE_Blocks.BLUE_LINOLEUM_STAIRS) .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.HERRINGBONE_SPRUCE_PLANKS_STAIRS)
.add(NSE_Blocks.CROSS_SPRUCE_PLANKS_STAIRS) .add(NSE_Blocks.CROSS_SPRUCE_PLANKS_STAIRS)
.add(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_STAIRS) .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_STAIRS)
.add(NSE_Blocks.STRAIGHT_PARQUET_STAIRS) .add(NSE_Blocks.STRAIGHT_OAK_PARQUET_STAIRS)
.add(NSE_Blocks.SEPARATED_PARQUET_STAIRS) .add(NSE_Blocks.SEPARATED_OAK_PARQUET_STAIRS)
.add(NSE_Blocks.GREEN_LINOLEUM_STAIRS) .add(NSE_Blocks.GREEN_LINOLEUM_STAIRS)
.add(NSE_Blocks.BLUE_LINOLEUM_STAIRS) .add(NSE_Blocks.BLUE_LINOLEUM_STAIRS)
.add(NSE_Blocks.RED_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.HERRINGBONE_SPRUCE_PLANKS_SLAB)
.add(NSE_Blocks.CROSS_SPRUCE_PLANKS_SLAB) .add(NSE_Blocks.CROSS_SPRUCE_PLANKS_SLAB)
.add(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_SLAB) .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_SLAB)
.add(NSE_Blocks.STRAIGHT_PARQUET_SLAB) .add(NSE_Blocks.STRAIGHT_OAK_PARQUET_SLAB)
.add(NSE_Blocks.SEPARATED_PARQUET_SLAB) .add(NSE_Blocks.SEPARATED_OAK_PARQUET_SLAB)
.add(NSE_Blocks.GREEN_LINOLEUM_SLAB) .add(NSE_Blocks.GREEN_LINOLEUM_SLAB)
.add(NSE_Blocks.BLUE_LINOLEUM_SLAB) .add(NSE_Blocks.BLUE_LINOLEUM_SLAB)
.add(NSE_Blocks.RED_LINOLEUM_SLAB) .add(NSE_Blocks.RED_LINOLEUM_SLAB)

4
src/main/java/su/a71/new_soviet/datagen/ItemTagGenerator.java
View file

@ -5,6 +5,7 @@ import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
import net.minecraft.registry.RegistryWrapper; 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_Items;
import su.a71.new_soviet.registration.NSE_Tags; import su.a71.new_soviet.registration.NSE_Tags;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
@ -22,5 +23,8 @@ public class ItemTagGenerator extends FabricTagProvider.ItemTagProvider {
.add(NSE_Items.DICE_D4) .add(NSE_Items.DICE_D4)
.add(NSE_Items.DICE_D6) .add(NSE_Items.DICE_D6)
.add(NSE_Items.DICE_D20); .add(NSE_Items.DICE_D20);
getOrCreateTagBuilder(ItemTags.MUSIC_DISCS)
.add(NSE_Items.MUSIC_DISC_USSR_ANTHEM);
} }
} }

4
src/main/java/su/a71/new_soviet/datagen/ModelGenerator.java
View file

@ -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_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.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.STRAIGHT_OAK_PARQUET, NSE_Blocks.STRAIGHT_OAK_PARQUET_STAIRS, NSE_Blocks.STRAIGHT_OAK_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.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.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.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"); registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.RED_LINOLEUM, NSE_Blocks.RED_LINOLEUM_STAIRS, NSE_Blocks.RED_LINOLEUM_SLAB, "floor/linoleum");

8
src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java
View file

@ -409,8 +409,8 @@ public class RecipeGenerator extends FabricRecipeProvider {
stoneCuttingCategory(exporter, Blocks.OAK_PLANKS, Util.make(Lists.newArrayList(), list -> { stoneCuttingCategory(exporter, Blocks.OAK_PLANKS, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.CROSS_OAK_PLANKS); list.add(NSE_Blocks.CROSS_OAK_PLANKS);
list.add(NSE_Blocks.HERRINGBONE_OAK_PLANKS); list.add(NSE_Blocks.HERRINGBONE_OAK_PLANKS);
list.add(NSE_Blocks.STRAIGHT_PARQUET); list.add(NSE_Blocks.STRAIGHT_OAK_PARQUET);
list.add(NSE_Blocks.SEPARATED_PARQUET); list.add(NSE_Blocks.SEPARATED_OAK_PARQUET);
}), RecipeCategory.BUILDING_BLOCKS); }), RecipeCategory.BUILDING_BLOCKS);
stoneCuttingCategory(exporter, Blocks.BIRCH_PLANKS, Util.make(Lists.newArrayList(), list -> { stoneCuttingCategory(exporter, Blocks.BIRCH_PLANKS, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.CROSS_BIRCH_PLANKS); 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.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.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.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.STRAIGHT_OAK_PARQUET_STAIRS, NSE_Blocks.STRAIGHT_OAK_PARQUET_SLAB, NSE_Blocks.STRAIGHT_OAK_PARQUET);
offerStairsAndSlab(exporter, NSE_Blocks.SEPARATED_PARQUET_STAIRS, NSE_Blocks.SEPARATED_PARQUET_SLAB, NSE_Blocks.SEPARATED_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.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.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); offerStairsAndSlab(exporter, NSE_Blocks.RED_LINOLEUM_STAIRS, NSE_Blocks.RED_LINOLEUM_SLAB, NSE_Blocks.RED_LINOLEUM);

36
src/main/java/su/a71/new_soviet/registration/NSE_Blocks.java
View file

@ -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 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 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 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 Block STRAIGHT_OAK_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 StairsBlock STRAIGHT_OAK_PARQUET_STAIRS = new StairsBlock(STRAIGHT_OAK_PARQUET.getDefaultState(), FabricBlockSettings.copy(STRAIGHT_OAK_PARQUET));
public static final SlabBlock STRAIGHT_PARQUET_SLAB = new SlabBlock(FabricBlockSettings.copy(STRAIGHT_PARQUET)); public static final SlabBlock STRAIGHT_OAK_PARQUET_SLAB = new SlabBlock(FabricBlockSettings.copy(STRAIGHT_OAK_PARQUET));
public static final Block SEPARATED_PARQUET = new Block(FabricBlockSettings.copy(HERRINGBONE_DARK_OAK_PARQUET)); public static final Block SEPARATED_OAK_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 StairsBlock SEPARATED_OAK_PARQUET_STAIRS = new StairsBlock(SEPARATED_OAK_PARQUET.getDefaultState(), FabricBlockSettings.copy(SEPARATED_OAK_PARQUET));
public static final SlabBlock SEPARATED_PARQUET_SLAB = new SlabBlock(FabricBlockSettings.copy(SEPARATED_PARQUET)); public static final SlabBlock SEPARATED_OAK_PARQUET_SLAB = new SlabBlock(FabricBlockSettings.copy(SEPARATED_OAK_PARQUET));
// LINOLEUM ======================= // LINOLEUM =======================
public static final Block GREEN_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.CHERRY_WOOD).strength(2, 3f).mapColor(MapColor.TERRACOTTA_GREEN)); 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", () -> 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_stairs", () -> HERRINGBONE_DARK_OAK_PARQUET_STAIRS, NSE_BUILDING_TAB);
registerBlock("herringbone_dark_oak_parquet_slab", () -> HERRINGBONE_DARK_OAK_PARQUET_SLAB, 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_oak_parquet", () -> STRAIGHT_OAK_PARQUET, NSE_BUILDING_TAB);
registerBlock("straight_parquet_stairs", () -> STRAIGHT_PARQUET_STAIRS, NSE_BUILDING_TAB); registerBlock("straight_oak_parquet_stairs", () -> STRAIGHT_OAK_PARQUET_STAIRS, NSE_BUILDING_TAB);
registerBlock("straight_parquet_slab", () -> STRAIGHT_PARQUET_SLAB, NSE_BUILDING_TAB); registerBlock("straight_oak_parquet_slab", () -> STRAIGHT_OAK_PARQUET_SLAB, NSE_BUILDING_TAB);
registerBlock("separated_parquet", () -> SEPARATED_PARQUET, NSE_BUILDING_TAB); registerBlock("separated_oak_parquet", () -> SEPARATED_OAK_PARQUET, NSE_BUILDING_TAB);
registerBlock("separated_parquet_stairs", () -> SEPARATED_PARQUET_STAIRS, NSE_BUILDING_TAB); registerBlock("separated_oak_parquet_stairs", () -> SEPARATED_OAK_PARQUET_STAIRS, NSE_BUILDING_TAB);
registerBlock("separated_parquet_slab", () -> SEPARATED_PARQUET_SLAB, 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", () -> GREEN_LINOLEUM, NSE_BUILDING_TAB);
registerBlock("green_linoleum_stairs", () -> GREEN_LINOLEUM_STAIRS, 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_BAMBOO_PLANKS, 20, 5);
flammableBlockRegistry.add(HERRINGBONE_DARK_OAK_PARQUET, 20, 5); flammableBlockRegistry.add(HERRINGBONE_DARK_OAK_PARQUET, 20, 5);
flammableBlockRegistry.add(STRAIGHT_PARQUET, 20, 5); flammableBlockRegistry.add(STRAIGHT_OAK_PARQUET, 20, 5);
flammableBlockRegistry.add(SEPARATED_PARQUET, 20, 5); flammableBlockRegistry.add(SEPARATED_OAK_PARQUET, 20, 5);
flammableBlockRegistry.add(GREEN_LINOLEUM, 20, 5); flammableBlockRegistry.add(GREEN_LINOLEUM, 20, 5);
flammableBlockRegistry.add(BLUE_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_STAIRS, 20, 5);
flammableBlockRegistry.add(HERRINGBONE_DARK_OAK_PARQUET_SLAB, 20, 5); flammableBlockRegistry.add(HERRINGBONE_DARK_OAK_PARQUET_SLAB, 20, 5);
flammableBlockRegistry.add(STRAIGHT_PARQUET_STAIRS, 20, 5); flammableBlockRegistry.add(STRAIGHT_OAK_PARQUET_STAIRS, 20, 5);
flammableBlockRegistry.add(STRAIGHT_PARQUET_SLAB, 20, 5); flammableBlockRegistry.add(STRAIGHT_OAK_PARQUET_SLAB, 20, 5);
flammableBlockRegistry.add(SEPARATED_PARQUET_STAIRS, 20, 5); flammableBlockRegistry.add(SEPARATED_OAK_PARQUET_STAIRS, 20, 5);
flammableBlockRegistry.add(SEPARATED_PARQUET_SLAB, 20, 5); flammableBlockRegistry.add(SEPARATED_OAK_PARQUET_SLAB, 20, 5);
flammableBlockRegistry.add(GREEN_LINOLEUM_STAIRS, 20, 5); flammableBlockRegistry.add(GREEN_LINOLEUM_STAIRS, 20, 5);
flammableBlockRegistry.add(GREEN_LINOLEUM_SLAB, 20, 5); flammableBlockRegistry.add(GREEN_LINOLEUM_SLAB, 20, 5);

5
src/main/java/su/a71/new_soviet/registration/NSE_Items.java
View file

@ -34,7 +34,8 @@ public class NSE_Items extends NSE_BaseRegistration {
public static final Item CIGARETTE_BUTT = new Item(new Item.Settings()); public static final Item CIGARETTE_BUTT = new Item(new Item.Settings());
public static final CigaretteItem CIGARETTE = new CigaretteItem(200, NSE_Items.CIGARETTE_BUTT, "item.new_soviet.tooltip.salute", new Item.Settings()); public static final CigaretteItem CIGARETTE = new CigaretteItem(200, NSE_Items.CIGARETTE_BUTT, "item.new_soviet.tooltip.salute", new Item.Settings());
// public static final MusicDiscItem BATTLE_IS_GOING_AGAIN = new MusicDiscItem(1, NSE_Sounds.MUSIC_LENIN, 123) TODO: Music pls?
public static final MusicDiscItem MUSIC_DISC_USSR_ANTHEM = new MusicDiscItem(1, NSE_Sounds.MUSIC_USSR_ANTHEM, new Item.Settings().maxCount(1), 206);
private static final ItemGroup NSE_ITEMS_TAB = FabricItemGroup.builder() private static final ItemGroup NSE_ITEMS_TAB = FabricItemGroup.builder()
.icon(() -> new ItemStack(SICKLE)) .icon(() -> new ItemStack(SICKLE))
@ -57,5 +58,7 @@ public class NSE_Items extends NSE_BaseRegistration {
registerPattern("sickle_pattern", Rarity.UNCOMMON, NSE_ITEMS_TAB); registerPattern("sickle_pattern", Rarity.UNCOMMON, NSE_ITEMS_TAB);
registerPattern("star_pattern", Rarity.UNCOMMON, NSE_ITEMS_TAB); registerPattern("star_pattern", Rarity.UNCOMMON, NSE_ITEMS_TAB);
registerPattern("grain_pattern", Rarity.UNCOMMON, NSE_ITEMS_TAB); registerPattern("grain_pattern", Rarity.UNCOMMON, NSE_ITEMS_TAB);
registerItem("music_disc_ussr_anthem", () -> MUSIC_DISC_USSR_ANTHEM, NSE_ITEMS_TAB);
} }
} }

2
src/main/java/su/a71/new_soviet/registration/NSE_Sounds.java
View file

@ -48,4 +48,6 @@ public class NSE_Sounds extends NSE_BaseRegistration {
public static final SoundEvent TV_ON_SOUND = registerSoundEvent("tv_on_sound"); public static final SoundEvent TV_ON_SOUND = registerSoundEvent("tv_on_sound");
public static final SoundEvent TV_OFF_SOUND = registerSoundEvent("tv_off_sound"); public static final SoundEvent TV_OFF_SOUND = registerSoundEvent("tv_off_sound");
public static final SoundEvent TV_BREAK_SOUND = registerSoundEvent("tv_break_sound"); public static final SoundEvent TV_BREAK_SOUND = registerSoundEvent("tv_break_sound");
public static final SoundEvent MUSIC_USSR_ANTHEM = registerSoundEvent("ussr_anthem");
} }

22
src/main/resources/assets/new_soviet/lang/en_us.json
View file

@ -131,9 +131,9 @@
"block.new_soviet.cross_mangrove_planks": "Cross Mangrove Planks", "block.new_soviet.cross_mangrove_planks": "Cross Mangrove Planks",
"block.new_soviet.herringbone_spruce_planks": "Herringbone Spruce Planks", "block.new_soviet.herringbone_spruce_planks": "Herringbone Spruce Planks",
"block.new_soviet.cross_spruce_planks": "Cross Spruce Planks", "block.new_soviet.cross_spruce_planks": "Cross Spruce Planks",
"block.new_soviet.herringbone_parquet": "Herringbone Parquet", "block.new_soviet.herringbone_dark_oak_parquet": "Herringbone Dark Oak Parquet",
"block.new_soviet.straight_parquet": "Straight Parquet", "block.new_soviet.straight_oak_parquet": "Straight Oak Parquet",
"block.new_soviet.separated_parquet": "Separated Parquet", "block.new_soviet.separated_oak_parquet": "Separated Oak Parquet",
"block.new_soviet.green_linoleum": "Green Linoleum", "block.new_soviet.green_linoleum": "Green Linoleum",
"block.new_soviet.blue_linoleum": "Blue Linoleum", "block.new_soviet.blue_linoleum": "Blue Linoleum",
"block.new_soviet.red_linoleum": "Red Linoleum", "block.new_soviet.red_linoleum": "Red Linoleum",
@ -148,6 +148,7 @@
"block.new_soviet.tv": "Orange TV", "block.new_soviet.tv": "Orange TV",
"block.new_soviet.red_tv": "Red TV", "block.new_soviet.red_tv": "Red TV",
"block.new_soviet.brown_tv": "Brown TV", "block.new_soviet.brown_tv": "Brown TV",
"block.new_soviet.green_tv": "Green TV",
"block.new_soviet.radio_receiver": "Radio", "block.new_soviet.radio_receiver": "Radio",
"block.new_soviet.table_lamp": "Table Lamp", "block.new_soviet.table_lamp": "Table Lamp",
"block.new_soviet.ceiling_fan": "Ceiling Fan", "block.new_soviet.ceiling_fan": "Ceiling Fan",
@ -445,12 +446,12 @@
"block.new_soviet.herringbone_spruce_planks_stairs": "Herringbone Spruce Stairs", "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_slab": "Cross Spruce Slab",
"block.new_soviet.cross_spruce_planks_stairs": "Cross Spruce Stairs", "block.new_soviet.cross_spruce_planks_stairs": "Cross Spruce Stairs",
"block.new_soviet.herringbone_parquet_slab": "Herringbone Parquet Slab", "block.new_soviet.herringbone_dark_oak_parquet_slab": "Herringbone Dark Oak Parquet Slab",
"block.new_soviet.herringbone_parquet_stairs": "Herringbone Parquet Stairs", "block.new_soviet.herringbone_dark_oak_parquet_stairs": "Herringbone Dark Oak Parquet Stairs",
"block.new_soviet.straight_parquet_slab": "Straight Parquet Slab", "block.new_soviet.straight_oak_parquet_slab": "Straight Oak Parquet Slab",
"block.new_soviet.straight_parquet_stairs": "Straight Parquet Stairs", "block.new_soviet.straight_oak_parquet_stairs": "Straight Oak Parquet Stairs",
"block.new_soviet.separated_parquet_slab": "Separated Parquet Slab", "block.new_soviet.separated_oak_parquet_slab": "Separated Oak Parquet Slab",
"block.new_soviet.separated_parquet_stairs": "Separated Parquet Stairs", "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_slab": "Green Linoleum Slab",
"block.new_soviet.green_linoleum_stairs": "Green Linoleum Stairs", "block.new_soviet.green_linoleum_stairs": "Green Linoleum Stairs",
"block.new_soviet.blue_linoleum_slab": "Blue Linoleum Slab", "block.new_soviet.blue_linoleum_slab": "Blue Linoleum Slab",
@ -510,6 +511,9 @@
"subtitles.new_soviet.tv_break": "TV screen shattered", "subtitles.new_soviet.tv_break": "TV screen shattered",
"item.new_soviet.antenna": "Antenna", "item.new_soviet.antenna": "Antenna",
"item.new_soviet.music_disc_ussr_anthem": "Music Disc",
"item.new_soviet.music_disc_ussr_anthem.desc": "Alexander Alexandrov - USSR anthem",
"advancement.new_soviet.root.name": "A New Era", "advancement.new_soviet.root.name": "A New Era",
"advancement.new_soviet.root.desc": "Time to create something great", "advancement.new_soviet.root.desc": "Time to create something great",
"advancement.new_soviet.sickle.name": "Tool of a worker", "advancement.new_soviet.sickle.name": "Tool of a worker",

12
src/main/resources/assets/new_soviet/lang/rpr.json
View file

@ -132,8 +132,8 @@
"block.new_soviet.herringbone_spruce_planks": "Еловый паркѣтъ «ёлочкой»", "block.new_soviet.herringbone_spruce_planks": "Еловый паркѣтъ «ёлочкой»",
"block.new_soviet.cross_spruce_planks": "Еловый паркѣтъ «крѣстиком»", "block.new_soviet.cross_spruce_planks": "Еловый паркѣтъ «крѣстиком»",
"block.new_soviet.herringbone_dark_oak_parquet": "Паркѣтъ из тѣмнаго дуба «ёлочкой»", "block.new_soviet.herringbone_dark_oak_parquet": "Паркѣтъ из тѣмнаго дуба «ёлочкой»",
"block.new_soviet.straight_parquet": "Прямой паркѣт", "block.new_soviet.straight_oak_parquet": "Прямой дубовый паркѣт",
"block.new_soviet.separated_parquet": "Раздѣлённый паркѣт", "block.new_soviet.separated_oak_parquet": "Раздѣлённый дубовый паркѣт",
"block.new_soviet.green_linoleum": "Зѣлёный линолѣум", "block.new_soviet.green_linoleum": "Зѣлёный линолѣум",
"block.new_soviet.blue_linoleum": "Синiй линолѣум", "block.new_soviet.blue_linoleum": "Синiй линолѣум",
"block.new_soviet.red_linoleum": "Червонный линолѣум", "block.new_soviet.red_linoleum": "Червонный линолѣум",
@ -427,10 +427,10 @@
"block.new_soviet.cross_spruce_planks_stairs": "Ступѣнi из еловаго паркѣта «крѣстиком»", "block.new_soviet.cross_spruce_planks_stairs": "Ступѣнi из еловаго паркѣта «крѣстиком»",
"block.new_soviet.herringbone_dark_oak_parquet_slab": "Плита из паркѣта тѣмнаго дуба «ёлочкой»", "block.new_soviet.herringbone_dark_oak_parquet_slab": "Плита из паркѣта тѣмнаго дуба «ёлочкой»",
"block.new_soviet.herringbone_dark_oak_parquet_stairs": "Ступѣнi из паркѣта тѣмнаго дуба «ёлочкой»", "block.new_soviet.herringbone_dark_oak_parquet_stairs": "Ступѣнi из паркѣта тѣмнаго дуба «ёлочкой»",
"block.new_soviet.straight_parquet_slab": "Плита из прямаго паркѣта", "block.new_soviet.straight_oak_parquet_slab": "Плита из прямаго дубового паркѣта",
"block.new_soviet.straight_parquet_stairs": "Ступѣнi из прямаго паркѣта", "block.new_soviet.straight_oak_parquet_stairs": "Ступѣнi из прямаго дубового паркѣта",
"block.new_soviet.separated_parquet_slab": "Плита из раздѣлённаго паркѣта", "block.new_soviet.separated_oak_parquet_slab": "Плита из раздѣлённаго дубового паркѣта",
"block.new_soviet.separated_parquet_stairs": "Ступѣнi из раздѣлённаго паркѣта", "block.new_soviet.separated_oak_parquet_stairs": "Ступѣнi из раздѣлённаго дубового паркѣта",
"block.new_soviet.green_linoleum_slab": "Плита из зѣлёнаго линолѣума", "block.new_soviet.green_linoleum_slab": "Плита из зѣлёнаго линолѣума",
"block.new_soviet.green_linoleum_stairs": "Ступѣнi из зѣлёнаго линолѣума", "block.new_soviet.green_linoleum_stairs": "Ступѣнi из зѣлёнаго линолѣума",
"block.new_soviet.blue_linoleum_slab": "Плита из синаго линолѣума", "block.new_soviet.blue_linoleum_slab": "Плита из синаго линолѣума",

12
src/main/resources/assets/new_soviet/lang/ru_ru.json
View file

@ -132,8 +132,8 @@
"block.new_soviet.herringbone_spruce_planks": "Еловый паркет «ёлочкой»", "block.new_soviet.herringbone_spruce_planks": "Еловый паркет «ёлочкой»",
"block.new_soviet.cross_spruce_planks": "Еловый паркет «крестиком»", "block.new_soviet.cross_spruce_planks": "Еловый паркет «крестиком»",
"block.new_soviet.herringbone_dark_oak_parquet": "Паркет из тёмного дуба «ёлочкой»", "block.new_soviet.herringbone_dark_oak_parquet": "Паркет из тёмного дуба «ёлочкой»",
"block.new_soviet.straight_parquet": "Прямой паркет", "block.new_soviet.straight_oak_parquet": "Прямой дубовый паркет",
"block.new_soviet.separated_parquet": "Разделённый паркет", "block.new_soviet.separated_oak_parquet": "Разделённый дубовый паркет",
"block.new_soviet.green_linoleum": "Зелёный линолеум", "block.new_soviet.green_linoleum": "Зелёный линолеум",
"block.new_soviet.blue_linoleum": "Синий линолеум", "block.new_soviet.blue_linoleum": "Синий линолеум",
"block.new_soviet.red_linoleum": "Красный линолеум", "block.new_soviet.red_linoleum": "Красный линолеум",
@ -448,10 +448,10 @@
"block.new_soviet.cross_spruce_planks_stairs": "Ступени из елового паркета «крестиком»", "block.new_soviet.cross_spruce_planks_stairs": "Ступени из елового паркета «крестиком»",
"block.new_soviet.herringbone_dark_oak_parquet_slab": "Плита из тёмно дубового паркета «ёлочкой»", "block.new_soviet.herringbone_dark_oak_parquet_slab": "Плита из тёмно дубового паркета «ёлочкой»",
"block.new_soviet.herringbone_dark_oak_parquet_stairs": "Ступени из тёмно дубового паркета «ёлочкой»", "block.new_soviet.herringbone_dark_oak_parquet_stairs": "Ступени из тёмно дубового паркета «ёлочкой»",
"block.new_soviet.straight_parquet_slab": "Плита из прямого паркета", "block.new_soviet.straight_oak_parquet_slab": "Плита из прямого дубового паркета",
"block.new_soviet.straight_parquet_stairs": "Ступени из прямого паркета", "block.new_soviet.straight_oak_parquet_stairs": "Ступени из прямого дубового паркета",
"block.new_soviet.separated_parquet_slab": "Плита из разделённого паркета", "block.new_soviet.separated_oak_parquet_slab": "Плита из разделённого дубового паркета",
"block.new_soviet.separated_parquet_stairs": "Ступени из разделённого паркета", "block.new_soviet.separated_oak_parquet_stairs": "Ступени из разделённого дубового паркета",
"block.new_soviet.green_linoleum_slab": "Плита из зелёного линолеума", "block.new_soviet.green_linoleum_slab": "Плита из зелёного линолеума",
"block.new_soviet.green_linoleum_stairs": "Ступени из зелёного линолеума", "block.new_soviet.green_linoleum_stairs": "Ступени из зелёного линолеума",
"block.new_soviet.blue_linoleum_slab": "Плита из синего линолеума", "block.new_soviet.blue_linoleum_slab": "Плита из синего линолеума",

6
src/main/resources/assets/new_soviet/models/item/music_disc_ussr_anthem.json Normal file
View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:item/template_music_disc",
"textures": {
"layer0": "new_soviet:item/discs/ussr_anthem"
}
}

8
src/main/resources/assets/new_soviet/sounds.json
View file

@ -111,6 +111,14 @@
"sounds": [ "sounds": [
"new_soviet:tv_break" "new_soviet:tv_break"
] ]
},
"ussr_anthem": {
"sounds": [
{
"name": "new_soviet:ussr_anthem",
"stream": true
}
]
} }
} }

BIN
src/main/resources/assets/new_soviet/sounds/ussr_anthem.ogg Normal file
View file

Binary file not shown.

BIN
src/main/resources/assets/new_soviet/textures/item/discs/ussr_anthem.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 323 B