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:367beac5918d27161b61abad265cdd586709247b
Branches Tags
Ethyl:1.20.1
Ethyl:1.20

No commits in common. "f2373e097145f653c0713e8ed61ba1efd28cbc4e" and "367beac5918d27161b61abad265cdd586709247b" have entirely different histories.
f2373e0971 ... 367beac591

71 changed files with 331 additions and 805 deletions
Show stats Expand all files Collapse all files

3
CHANGELOG
View file

@ -59,11 +59,12 @@ This version focuses on QOL and bug fixes
* Star
* Grain(?)
* Added a new antenna item to improve radio electronics recipes
* Changed textures for dirt road, green-white tiles and TV white noise
* Changed texture of dirt road
* Bug fixes
* Fixed a few missing drops/tags/recipes related to concrete
* Concrete with bars is now pickaxe mine-able
* Some concrete blocks now have drops
* Cracked concrete now has a dyeing category
* Technical changes
* Minor asset location/name changes - e.g. concrete with bars models moved to separate folder

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

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

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

@ -1,13 +0,0 @@
{
"variants": {
"type=bottom": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_slab"
},
"type=double": {
"model": "new_soviet:block/herringbone_dark_oak_parquet"
},
"type=top": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_slab_top"
}
}
}

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

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

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

@ -0,0 +1,13 @@
{
"variants": {
"type=bottom": {
"model": "new_soviet:block/herringbone_parquet_slab"
},
"type=double": {
"model": "new_soviet:block/herringbone_parquet"
},
"type=top": {
"model": "new_soviet:block/herringbone_parquet_slab_top"
}
}
}

80
src/main/generated/assets/new_soviet/blockstates/herringbone_dark_oak_parquet_stairs.json → src/main/generated/assets/new_soviet/blockstates/herringbone_parquet_stairs.json
View file

@ -1,206 +1,206 @@
{
"variants": {
"facing=east,half=bottom,shape=inner_left": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_inner",
"model": "new_soviet:block/herringbone_parquet_stairs_inner",
"uvlock": true,
"y": 270
},
"facing=east,half=bottom,shape=inner_right": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_inner"
"model": "new_soviet:block/herringbone_parquet_stairs_inner"
},
"facing=east,half=bottom,shape=outer_left": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_outer",
"model": "new_soviet:block/herringbone_parquet_stairs_outer",
"uvlock": true,
"y": 270
},
"facing=east,half=bottom,shape=outer_right": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_outer"
"model": "new_soviet:block/herringbone_parquet_stairs_outer"
},
"facing=east,half=bottom,shape=straight": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs"
"model": "new_soviet:block/herringbone_parquet_stairs"
},
"facing=east,half=top,shape=inner_left": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_inner",
"model": "new_soviet:block/herringbone_parquet_stairs_inner",
"uvlock": true,
"x": 180
},
"facing=east,half=top,shape=inner_right": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_inner",
"model": "new_soviet:block/herringbone_parquet_stairs_inner",
"uvlock": true,
"x": 180,
"y": 90
},
"facing=east,half=top,shape=outer_left": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_outer",
"model": "new_soviet:block/herringbone_parquet_stairs_outer",
"uvlock": true,
"x": 180
},
"facing=east,half=top,shape=outer_right": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_outer",
"model": "new_soviet:block/herringbone_parquet_stairs_outer",
"uvlock": true,
"x": 180,
"y": 90
},
"facing=east,half=top,shape=straight": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs",
"model": "new_soviet:block/herringbone_parquet_stairs",
"uvlock": true,
"x": 180
},
"facing=north,half=bottom,shape=inner_left": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_inner",
"model": "new_soviet:block/herringbone_parquet_stairs_inner",
"uvlock": true,
"y": 180
},
"facing=north,half=bottom,shape=inner_right": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_inner",
"model": "new_soviet:block/herringbone_parquet_stairs_inner",
"uvlock": true,
"y": 270
},
"facing=north,half=bottom,shape=outer_left": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_outer",
"model": "new_soviet:block/herringbone_parquet_stairs_outer",
"uvlock": true,
"y": 180
},
"facing=north,half=bottom,shape=outer_right": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_outer",
"model": "new_soviet:block/herringbone_parquet_stairs_outer",
"uvlock": true,
"y": 270
},
"facing=north,half=bottom,shape=straight": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs",
"model": "new_soviet:block/herringbone_parquet_stairs",
"uvlock": true,
"y": 270
},
"facing=north,half=top,shape=inner_left": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_inner",
"model": "new_soviet:block/herringbone_parquet_stairs_inner",
"uvlock": true,
"x": 180,
"y": 270
},
"facing=north,half=top,shape=inner_right": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_inner",
"model": "new_soviet:block/herringbone_parquet_stairs_inner",
"uvlock": true,
"x": 180
},
"facing=north,half=top,shape=outer_left": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_outer",
"model": "new_soviet:block/herringbone_parquet_stairs_outer",
"uvlock": true,
"x": 180,
"y": 270
},
"facing=north,half=top,shape=outer_right": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_outer",
"model": "new_soviet:block/herringbone_parquet_stairs_outer",
"uvlock": true,
"x": 180
},
"facing=north,half=top,shape=straight": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs",
"model": "new_soviet:block/herringbone_parquet_stairs",
"uvlock": true,
"x": 180,
"y": 270
},
"facing=south,half=bottom,shape=inner_left": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_inner"
"model": "new_soviet:block/herringbone_parquet_stairs_inner"
},
"facing=south,half=bottom,shape=inner_right": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_inner",
"model": "new_soviet:block/herringbone_parquet_stairs_inner",
"uvlock": true,
"y": 90
},
"facing=south,half=bottom,shape=outer_left": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_outer"
"model": "new_soviet:block/herringbone_parquet_stairs_outer"
},
"facing=south,half=bottom,shape=outer_right": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_outer",
"model": "new_soviet:block/herringbone_parquet_stairs_outer",
"uvlock": true,
"y": 90
},
"facing=south,half=bottom,shape=straight": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs",
"model": "new_soviet:block/herringbone_parquet_stairs",
"uvlock": true,
"y": 90
},
"facing=south,half=top,shape=inner_left": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_inner",
"model": "new_soviet:block/herringbone_parquet_stairs_inner",
"uvlock": true,
"x": 180,
"y": 90
},
"facing=south,half=top,shape=inner_right": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_inner",
"model": "new_soviet:block/herringbone_parquet_stairs_inner",
"uvlock": true,
"x": 180,
"y": 180
},
"facing=south,half=top,shape=outer_left": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_outer",
"model": "new_soviet:block/herringbone_parquet_stairs_outer",
"uvlock": true,
"x": 180,
"y": 90
},
"facing=south,half=top,shape=outer_right": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_outer",
"model": "new_soviet:block/herringbone_parquet_stairs_outer",
"uvlock": true,
"x": 180,
"y": 180
},
"facing=south,half=top,shape=straight": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs",
"model": "new_soviet:block/herringbone_parquet_stairs",
"uvlock": true,
"x": 180,
"y": 90
},
"facing=west,half=bottom,shape=inner_left": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_inner",
"model": "new_soviet:block/herringbone_parquet_stairs_inner",
"uvlock": true,
"y": 90
},
"facing=west,half=bottom,shape=inner_right": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_inner",
"model": "new_soviet:block/herringbone_parquet_stairs_inner",
"uvlock": true,
"y": 180
},
"facing=west,half=bottom,shape=outer_left": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_outer",
"model": "new_soviet:block/herringbone_parquet_stairs_outer",
"uvlock": true,
"y": 90
},
"facing=west,half=bottom,shape=outer_right": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_outer",
"model": "new_soviet:block/herringbone_parquet_stairs_outer",
"uvlock": true,
"y": 180
},
"facing=west,half=bottom,shape=straight": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs",
"model": "new_soviet:block/herringbone_parquet_stairs",
"uvlock": true,
"y": 180
},
"facing=west,half=top,shape=inner_left": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_inner",
"model": "new_soviet:block/herringbone_parquet_stairs_inner",
"uvlock": true,
"x": 180,
"y": 180
},
"facing=west,half=top,shape=inner_right": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_inner",
"model": "new_soviet:block/herringbone_parquet_stairs_inner",
"uvlock": true,
"x": 180,
"y": 270
},
"facing=west,half=top,shape=outer_left": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_outer",
"model": "new_soviet:block/herringbone_parquet_stairs_outer",
"uvlock": true,
"x": 180,
"y": 180
},
"facing=west,half=top,shape=outer_right": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_outer",
"model": "new_soviet:block/herringbone_parquet_stairs_outer",
"uvlock": true,
"x": 180,
"y": 270
},
"facing=west,half=top,shape=straight": {
"model": "new_soviet:block/herringbone_dark_oak_parquet_stairs",
"model": "new_soviet:block/herringbone_parquet_stairs",
"uvlock": true,
"x": 180,
"y": 180

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

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

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

@ -1,8 +0,0 @@
{
"parent": "minecraft:block/slab",
"textures": {
"bottom": "new_soviet:block/floor/planks/herringbone_dark_oak_parquet",
"side": "new_soviet:block/floor/planks/herringbone_dark_oak_parquet",
"top": "new_soviet:block/floor/planks/herringbone_dark_oak_parquet"
}
}

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

@ -1,8 +0,0 @@
{
"parent": "minecraft:block/slab_top",
"textures": {
"bottom": "new_soviet:block/floor/planks/herringbone_dark_oak_parquet",
"side": "new_soviet:block/floor/planks/herringbone_dark_oak_parquet",
"top": "new_soviet:block/floor/planks/herringbone_dark_oak_parquet"
}
}

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

@ -1,8 +0,0 @@
{
"parent": "minecraft:block/stairs",
"textures": {
"bottom": "new_soviet:block/floor/planks/herringbone_dark_oak_parquet",
"side": "new_soviet:block/floor/planks/herringbone_dark_oak_parquet",
"top": "new_soviet:block/floor/planks/herringbone_dark_oak_parquet"
}
}

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

@ -1,8 +0,0 @@
{
"parent": "minecraft:block/inner_stairs",
"textures": {
"bottom": "new_soviet:block/floor/planks/herringbone_dark_oak_parquet",
"side": "new_soviet:block/floor/planks/herringbone_dark_oak_parquet",
"top": "new_soviet:block/floor/planks/herringbone_dark_oak_parquet"
}
}

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

@ -1,8 +0,0 @@
{
"parent": "minecraft:block/outer_stairs",
"textures": {
"bottom": "new_soviet:block/floor/planks/herringbone_dark_oak_parquet",
"side": "new_soviet:block/floor/planks/herringbone_dark_oak_parquet",
"top": "new_soviet:block/floor/planks/herringbone_dark_oak_parquet"
}
}

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

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

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

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/slab",
"textures": {
"bottom": "new_soviet:block/floor/planks/herringbone_parquet",
"side": "new_soviet:block/floor/planks/herringbone_parquet",
"top": "new_soviet:block/floor/planks/herringbone_parquet"
}
}

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

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/slab_top",
"textures": {
"bottom": "new_soviet:block/floor/planks/herringbone_parquet",
"side": "new_soviet:block/floor/planks/herringbone_parquet",
"top": "new_soviet:block/floor/planks/herringbone_parquet"
}
}

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

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/stairs",
"textures": {
"bottom": "new_soviet:block/floor/planks/herringbone_parquet",
"side": "new_soviet:block/floor/planks/herringbone_parquet",
"top": "new_soviet:block/floor/planks/herringbone_parquet"
}
}

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

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/inner_stairs",
"textures": {
"bottom": "new_soviet:block/floor/planks/herringbone_parquet",
"side": "new_soviet:block/floor/planks/herringbone_parquet",
"top": "new_soviet:block/floor/planks/herringbone_parquet"
}
}

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

@ -0,0 +1,8 @@
{
"parent": "minecraft:block/outer_stairs",
"textures": {
"bottom": "new_soviet:block/floor/planks/herringbone_parquet",
"side": "new_soviet:block/floor/planks/herringbone_parquet",
"top": "new_soviet:block/floor/planks/herringbone_parquet"
}
}

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -21,7 +21,7 @@
"new_soviet:cross_mangrove_planks",
"new_soviet:herringbone_spruce_planks",
"new_soviet:cross_spruce_planks",
"new_soviet:herringbone_dark_oak_parquet",
"new_soviet:herringbone_parquet",
"new_soviet:straight_parquet",
"new_soviet:separated_parquet",
"new_soviet:green_linoleum",
@ -76,8 +76,8 @@
"new_soviet:herringbone_spruce_planks_slab",
"new_soviet:cross_spruce_planks_stairs",
"new_soviet:cross_spruce_planks_slab",
"new_soviet:herringbone_dark_oak_parquet_stairs",
"new_soviet:herringbone_dark_oak_parquet_slab",
"new_soviet:herringbone_parquet_stairs",
"new_soviet:herringbone_parquet_slab",
"new_soviet:straight_parquet_stairs",
"new_soviet:straight_parquet_slab",
"new_soviet:separated_parquet_stairs",

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

@ -94,7 +94,7 @@
"new_soviet:cross_mangrove_planks_slab",
"new_soviet:herringbone_spruce_planks_slab",
"new_soviet:cross_spruce_planks_slab",
"new_soviet:herringbone_dark_oak_parquet_slab",
"new_soviet:herringbone_parquet_slab",
"new_soviet:straight_parquet_slab",
"new_soviet:separated_parquet_slab",
"new_soviet:green_linoleum_slab",

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

@ -94,7 +94,7 @@
"new_soviet:cross_mangrove_planks_stairs",
"new_soviet:herringbone_spruce_planks_stairs",
"new_soviet:cross_spruce_planks_stairs",
"new_soviet:herringbone_dark_oak_parquet_stairs",
"new_soviet:herringbone_parquet_stairs",
"new_soviet:straight_parquet_stairs",
"new_soviet:separated_parquet_stairs",
"new_soviet:green_linoleum_stairs",

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

@ -1,35 +0,0 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_herringbone_dark_oak_parquet": {
"conditions": {
"items": [
{
"items": [
"new_soviet:herringbone_dark_oak_parquet"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:herringbone_dark_oak_parquet_stairs_from_herringbone_dark_oak_parquet_stonecutting"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_herringbone_dark_oak_parquet",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"minecraft:herringbone_dark_oak_parquet_stairs_from_herringbone_dark_oak_parquet_stonecutting"
]
},
"sends_telemetry_event": false
}

10
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_dark_oak_parquet_slab.json → src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_parquet_from_spruce_planks_stonecutting.json
View file

@ -1,12 +1,12 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_herringbone_dark_oak_parquet": {
"has_spruce_planks": {
"conditions": {
"items": [
{
"items": [
"new_soviet:herringbone_dark_oak_parquet"
"minecraft:spruce_planks"
]
}
]
@ -15,20 +15,20 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "new_soviet:herringbone_dark_oak_parquet_slab"
"recipe": "minecraft:herringbone_parquet_from_spruce_planks_stonecutting"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_herringbone_dark_oak_parquet",
"has_spruce_planks",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"new_soviet:herringbone_dark_oak_parquet_slab"
"minecraft:herringbone_parquet_from_spruce_planks_stonecutting"
]
},
"sends_telemetry_event": false

10
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_dark_oak_parquet_stairs.json → src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_parquet_slab.json
View file

@ -1,12 +1,12 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_herringbone_dark_oak_parquet": {
"has_herringbone_parquet": {
"conditions": {
"items": [
{
"items": [
"new_soviet:herringbone_dark_oak_parquet"
"new_soviet:herringbone_parquet"
]
}
]
@ -15,20 +15,20 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "new_soviet:herringbone_dark_oak_parquet_stairs"
"recipe": "new_soviet:herringbone_parquet_slab"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_herringbone_dark_oak_parquet",
"has_herringbone_parquet",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"new_soviet:herringbone_dark_oak_parquet_stairs"
"new_soviet:herringbone_parquet_slab"
]
},
"sends_telemetry_event": false

10
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_dark_oak_parquet_slab_from_herringbone_dark_oak_parquet_stonecutting.json → src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_parquet_slab_from_herringbone_parquet_stonecutting.json
View file

@ -1,12 +1,12 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_herringbone_dark_oak_parquet": {
"has_herringbone_parquet": {
"conditions": {
"items": [
{
"items": [
"new_soviet:herringbone_dark_oak_parquet"
"new_soviet:herringbone_parquet"
]
}
]
@ -15,20 +15,20 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:herringbone_dark_oak_parquet_slab_from_herringbone_dark_oak_parquet_stonecutting"
"recipe": "minecraft:herringbone_parquet_slab_from_herringbone_parquet_stonecutting"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_herringbone_dark_oak_parquet",
"has_herringbone_parquet",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"minecraft:herringbone_dark_oak_parquet_slab_from_herringbone_dark_oak_parquet_stonecutting"
"minecraft:herringbone_parquet_slab_from_herringbone_parquet_stonecutting"
]
},
"sends_telemetry_event": false

10
src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_dark_oak_parquet_from_dark_oak_planks_stonecutting.json → src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_parquet_stairs.json
View file

@ -1,12 +1,12 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_dark_oak_planks": {
"has_herringbone_parquet": {
"conditions": {
"items": [
{
"items": [
"minecraft:dark_oak_planks"
"new_soviet:herringbone_parquet"
]
}
]
@ -15,20 +15,20 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:herringbone_dark_oak_parquet_from_dark_oak_planks_stonecutting"
"recipe": "new_soviet:herringbone_parquet_stairs"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_dark_oak_planks",
"has_herringbone_parquet",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"minecraft:herringbone_dark_oak_parquet_from_dark_oak_planks_stonecutting"
"new_soviet:herringbone_parquet_stairs"
]
},
"sends_telemetry_event": false

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

@ -0,0 +1,35 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_herringbone_parquet": {
"conditions": {
"items": [
{
"items": [
"new_soviet:herringbone_parquet"
]
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:herringbone_parquet_stairs_from_herringbone_parquet_stonecutting"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_herringbone_parquet",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"minecraft:herringbone_parquet_stairs_from_herringbone_parquet_stonecutting"
]
},
"sends_telemetry_event": false
}

2
src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_dark_oak_parquet.json → src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_parquet.json
View file

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

2
src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_dark_oak_parquet_slab.json → src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_parquet_slab.json
View file

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

2
src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_dark_oak_parquet_stairs.json → src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_parquet_stairs.json
View file

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

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

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

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

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

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

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

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

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

4
src/main/generated/data/new_soviet/recipes/herringbone_dark_oak_parquet_slab.json → src/main/generated/data/new_soviet/recipes/herringbone_parquet_slab.json
View file

@ -3,7 +3,7 @@
"category": "building",
"key": {
"#": {
"item": "new_soviet:herringbone_dark_oak_parquet"
"item": "new_soviet:herringbone_parquet"
}
},
"pattern": [
@ -11,7 +11,7 @@
],
"result": {
"count": 6,
"item": "new_soviet:herringbone_dark_oak_parquet_slab"
"item": "new_soviet:herringbone_parquet_slab"
},
"show_notification": true
}

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

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

4
src/main/generated/data/new_soviet/recipes/herringbone_dark_oak_parquet_stairs.json → src/main/generated/data/new_soviet/recipes/herringbone_parquet_stairs.json
View file

@ -3,7 +3,7 @@
"category": "building",
"key": {
"#": {
"item": "new_soviet:herringbone_dark_oak_parquet"
"item": "new_soviet:herringbone_parquet"
}
},
"pattern": [
@ -13,7 +13,7 @@
],
"result": {
"count": 4,
"item": "new_soviet:herringbone_dark_oak_parquet_stairs"
"item": "new_soviet:herringbone_parquet_stairs"
},
"show_notification": true
}

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

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

63
src/main/java/su/a71/new_soviet/blocks/ConcreteWithBarsBlock.java
View file

@ -1,14 +1,13 @@
package su.a71.new_soviet.blocks;
import net.minecraft.block.*;
import net.minecraft.block.enums.WallMountLocation;
import net.minecraft.entity.Entity;
import net.minecraft.fluid.FluidState;
import net.minecraft.fluid.Fluids;
import net.minecraft.item.ItemPlacementContext;
import net.minecraft.state.StateManager;
import net.minecraft.state.property.BooleanProperty;
import net.minecraft.state.property.EnumProperty;
import net.minecraft.state.property.DirectionProperty;
import net.minecraft.state.property.Properties;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
@ -16,53 +15,38 @@ import net.minecraft.util.shape.VoxelShape;
import net.minecraft.world.BlockView;
import net.minecraft.world.World;
import net.minecraft.world.WorldAccess;
import org.jetbrains.annotations.Nullable;
import su.a71.new_soviet.util.Shapes;
import java.util.List;
public class ConcreteWithBarsBlock extends WallMountedBlock implements Waterloggable {
public class ConcreteWithBarsBlock extends HorizontalFacingBlock implements Waterloggable {
public static final DirectionProperty VERTICAL_DIRECTION;
public static final BooleanProperty WATERLOGGED;
public static final Shapes.HorizontalShape SHAPE_WALL;
public static final Shapes.HorizontalShape SHAPE_FLOOR;
public static final Shapes.HorizontalShape SHAPE_CEILING;
public static final EnumProperty<WallMountLocation> FACE;
public static final VoxelShape SHAPE_UP;
public static final VoxelShape SHAPE_DOWN;
public ConcreteWithBarsBlock(Settings settings) {
super(settings);
setDefaultState(getDefaultState()
.with(Properties.HORIZONTAL_FACING, Direction.NORTH)
.with(FACE, WallMountLocation.FLOOR)
.with(VERTICAL_DIRECTION, Direction.UP)
.with(WATERLOGGED, false));
}
@Override
protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
builder.add(Properties.HORIZONTAL_FACING, FACE, WATERLOGGED);
builder.add(Properties.HORIZONTAL_FACING, VERTICAL_DIRECTION, WATERLOGGED);
}
@Nullable
@Override
public BlockState getPlacementState(ItemPlacementContext ctx) {
FluidState fluidState = ctx.getWorld().getFluidState(ctx.getBlockPos());
for (Direction direction : ctx.getPlacementDirections()) {
BlockState blockState;
if (direction.getAxis() == Direction.Axis.Y) {
blockState = this.getDefaultState().with(FACE, direction == Direction.UP ? WallMountLocation.CEILING : WallMountLocation.FLOOR).with(FACING, ctx.getHorizontalPlayerFacing());
} else {
blockState = this.getDefaultState().with(FACE, WallMountLocation.WALL).with(FACING, direction.getOpposite());
}
if (blockState.canPlaceAt(ctx.getWorld(), ctx.getBlockPos())) {
return blockState.with(WATERLOGGED, fluidState.getFluid() == Fluids.WATER);
}
}
return null;
return super.getPlacementState(ctx)
.with(Properties.HORIZONTAL_FACING, ctx.getHorizontalPlayerFacing().getOpposite())
.with(VERTICAL_DIRECTION, ctx.getVerticalPlayerLookDirection().getOpposite())
.with(WATERLOGGED, fluidState.getFluid() == Fluids.WATER);
}
public void onLandedUpon(World world, BlockState state, BlockPos pos, Entity entity, float fallDistance) {
if (state.get(FACE) == WallMountLocation.CEILING) {
if (state.get(VERTICAL_DIRECTION) == Direction.UP) {
entity.handleFallDamage(fallDistance + 2.0F, 2.0F, world.getDamageSources().stalagmite());
} else {
super.onLandedUpon(world, state, pos, entity, fallDistance);
@ -70,16 +54,10 @@ public class ConcreteWithBarsBlock extends WallMountedBlock implements Waterlogg
}
public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) {
return switch (state.get(FACE)) {
case FLOOR -> SHAPE_FLOOR.north();
case WALL -> switch (state.get(FACING)) {
case NORTH -> SHAPE_WALL.north();
case SOUTH -> SHAPE_WALL.south();
case WEST -> SHAPE_WALL.west();
default -> SHAPE_WALL.east();
};
default -> SHAPE_CEILING.north();
};
if (state.get(VERTICAL_DIRECTION) == Direction.DOWN) {
return SHAPE_UP;
}
return SHAPE_DOWN;
}
@Override
@ -95,10 +73,9 @@ public class ConcreteWithBarsBlock extends WallMountedBlock implements Waterlogg
}
static {
FACE = Properties.WALL_MOUNT_LOCATION;
VERTICAL_DIRECTION = Properties.VERTICAL_DIRECTION;
WATERLOGGED = Properties.WATERLOGGED;
SHAPE_FLOOR = new Shapes.HorizontalShape(List.of(List.of(0.01, 0.0, 0.01, 15.99, 8.0, 15.99)));
SHAPE_CEILING = new Shapes.HorizontalShape(List.of(List.of(0.01, 8.0, 0.01, 15.99, 15.99, 15.99)));
SHAPE_WALL = new Shapes.HorizontalShape(List.of(List.of(0.01, 0.01, 8.0, 15.99, 15.99, 15.99)));
SHAPE_DOWN = Block.createCuboidShape(0, 0, 0, 16, 8, 16);
SHAPE_UP = Block.createCuboidShape(0, 8, 0, 16, 16, 16);
}
}

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

@ -153,7 +153,7 @@ public class BlockLootTables extends FabricBlockLootTableProvider {
addDrop(NSE_Blocks.CROSS_MANGROVE_PLANKS);
addDrop(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS);
addDrop(NSE_Blocks.CROSS_SPRUCE_PLANKS);
addDrop(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET);
addDrop(NSE_Blocks.HERRINGBONE_PARQUET);
addDrop(NSE_Blocks.STRAIGHT_PARQUET);
addDrop(NSE_Blocks.SEPARATED_PARQUET);
addDrop(NSE_Blocks.GREEN_LINOLEUM);
@ -455,8 +455,8 @@ public class BlockLootTables extends FabricBlockLootTableProvider {
addDrop(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_STAIRS);
addDrop(NSE_Blocks.CROSS_SPRUCE_PLANKS_SLAB);
addDrop(NSE_Blocks.CROSS_SPRUCE_PLANKS_STAIRS);
addDrop(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_SLAB);
addDrop(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_STAIRS);
addDrop(NSE_Blocks.HERRINGBONE_PARQUET_SLAB);
addDrop(NSE_Blocks.HERRINGBONE_PARQUET_STAIRS);
addDrop(NSE_Blocks.STRAIGHT_PARQUET_SLAB);
addDrop(NSE_Blocks.STRAIGHT_PARQUET_STAIRS);
addDrop(NSE_Blocks.SEPARATED_PARQUET_SLAB);

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

@ -363,7 +363,7 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider {
.add(NSE_Blocks.CROSS_MANGROVE_PLANKS)
.add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS)
.add(NSE_Blocks.CROSS_SPRUCE_PLANKS)
.add(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET)
.add(NSE_Blocks.HERRINGBONE_PARQUET)
.add(NSE_Blocks.STRAIGHT_PARQUET)
.add(NSE_Blocks.SEPARATED_PARQUET)
.add(NSE_Blocks.GREEN_LINOLEUM)
@ -418,8 +418,8 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider {
.add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_SLAB)
.add(NSE_Blocks.CROSS_SPRUCE_PLANKS_STAIRS)
.add(NSE_Blocks.CROSS_SPRUCE_PLANKS_SLAB)
.add(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_STAIRS)
.add(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_SLAB)
.add(NSE_Blocks.HERRINGBONE_PARQUET_STAIRS)
.add(NSE_Blocks.HERRINGBONE_PARQUET_SLAB)
.add(NSE_Blocks.STRAIGHT_PARQUET_STAIRS)
.add(NSE_Blocks.STRAIGHT_PARQUET_SLAB)
.add(NSE_Blocks.SEPARATED_PARQUET_STAIRS)
@ -602,7 +602,7 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider {
.add(NSE_Blocks.CROSS_MANGROVE_PLANKS_STAIRS)
.add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_STAIRS)
.add(NSE_Blocks.CROSS_SPRUCE_PLANKS_STAIRS)
.add(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_STAIRS)
.add(NSE_Blocks.HERRINGBONE_PARQUET_STAIRS)
.add(NSE_Blocks.STRAIGHT_PARQUET_STAIRS)
.add(NSE_Blocks.SEPARATED_PARQUET_STAIRS)
.add(NSE_Blocks.GREEN_LINOLEUM_STAIRS)
@ -715,7 +715,7 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider {
.add(NSE_Blocks.CROSS_MANGROVE_PLANKS_SLAB)
.add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_SLAB)
.add(NSE_Blocks.CROSS_SPRUCE_PLANKS_SLAB)
.add(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_SLAB)
.add(NSE_Blocks.HERRINGBONE_PARQUET_SLAB)
.add(NSE_Blocks.STRAIGHT_PARQUET_SLAB)
.add(NSE_Blocks.SEPARATED_PARQUET_SLAB)
.add(NSE_Blocks.GREEN_LINOLEUM_SLAB)

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

@ -213,7 +213,7 @@ public class ModelGenerator extends FabricModelProvider {
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.CROSS_CHERRY_PLANKS, NSE_Blocks.CROSS_CHERRY_PLANKS_STAIRS, NSE_Blocks.CROSS_CHERRY_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_PARQUET, NSE_Blocks.HERRINGBONE_PARQUET_STAIRS, NSE_Blocks.HERRINGBONE_PARQUET_SLAB, "floor/planks");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.STRAIGHT_PARQUET, NSE_Blocks.STRAIGHT_PARQUET_STAIRS, NSE_Blocks.STRAIGHT_PARQUET_SLAB, "floor/planks");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.SEPARATED_PARQUET, NSE_Blocks.SEPARATED_PARQUET_STAIRS, NSE_Blocks.SEPARATED_PARQUET_SLAB, "floor/planks");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.GREEN_LINOLEUM, NSE_Blocks.GREEN_LINOLEUM_STAIRS, NSE_Blocks.GREEN_LINOLEUM_SLAB, "floor/linoleum");

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

@ -427,7 +427,6 @@ public class RecipeGenerator extends FabricRecipeProvider {
stoneCuttingCategory(exporter, Blocks.DARK_OAK_PLANKS, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.CROSS_DARK_OAK_PLANKS);
list.add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS);
list.add(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET);
}), RecipeCategory.BUILDING_BLOCKS);
stoneCuttingCategory(exporter, Blocks.JUNGLE_PLANKS, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.CROSS_JUNGLE_PLANKS);
@ -440,6 +439,7 @@ public class RecipeGenerator extends FabricRecipeProvider {
stoneCuttingCategory(exporter, Blocks.SPRUCE_PLANKS, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.CROSS_SPRUCE_PLANKS);
list.add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS);
list.add(NSE_Blocks.HERRINGBONE_PARQUET);
}), RecipeCategory.BUILDING_BLOCKS);
stoneCuttingCategory(exporter, Blocks.CHERRY_PLANKS, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.CROSS_CHERRY_PLANKS);
@ -781,7 +781,7 @@ public class RecipeGenerator extends FabricRecipeProvider {
offerStairsAndSlab(exporter, NSE_Blocks.CROSS_MANGROVE_PLANKS_STAIRS, NSE_Blocks.CROSS_MANGROVE_PLANKS_SLAB, NSE_Blocks.CROSS_MANGROVE_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.HERRINGBONE_DARK_OAK_PARQUET_STAIRS, NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_SLAB, NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET);
offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_PARQUET_STAIRS, NSE_Blocks.HERRINGBONE_PARQUET_SLAB, NSE_Blocks.HERRINGBONE_PARQUET);
offerStairsAndSlab(exporter, NSE_Blocks.STRAIGHT_PARQUET_STAIRS, NSE_Blocks.STRAIGHT_PARQUET_SLAB, NSE_Blocks.STRAIGHT_PARQUET);
offerStairsAndSlab(exporter, NSE_Blocks.SEPARATED_PARQUET_STAIRS, NSE_Blocks.SEPARATED_PARQUET_SLAB, NSE_Blocks.SEPARATED_PARQUET);
offerStairsAndSlab(exporter, NSE_Blocks.GREEN_LINOLEUM_STAIRS, NSE_Blocks.GREEN_LINOLEUM_SLAB, NSE_Blocks.GREEN_LINOLEUM);

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

@ -264,15 +264,6 @@ public class NSE_Blocks extends NSE_BaseRegistration {
public static final Block SMALL_YELLOW_TILES = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).strength(1.5f, 6f).requiresTool().mapColor(MapColor.YELLOW));
public static final Block SMALL_CRACKED_YELLOW_TILES = new Block(FabricBlockSettings.copy(SMALL_YELLOW_TILES));
public static final Block YELLOW_BRICKS = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).strength(1.5f, 6f).requiresTool().mapColor(MapColor.YELLOW));
public static final StairsBlock YELLOW_BRICKS_STAIRS = new StairsBlock(YELLOW_BRICKS.getDefaultState(), FabricBlockSettings.copy(YELLOW_BRICKS));
public static final SlabBlock YELLOW_BRICKS_SLAB = new SlabBlock(FabricBlockSettings.copy(YELLOW_BRICKS));
public static final Block CRACKED_YELLOW_BRICKS = new Block(FabricBlockSettings.copy(NSE_Blocks.YELLOW_BRICKS));
public static final StairsBlock CRACKED_YELLOW_BRICKS_STAIRS = new StairsBlock(CRACKED_YELLOW_BRICKS.getDefaultState(), FabricBlockSettings.copy(CRACKED_YELLOW_BRICKS));
public static final SlabBlock CRACKED_YELLOW_BRICKS_SLAB = new SlabBlock(FabricBlockSettings.copy(CRACKED_YELLOW_BRICKS));
public static final Block MOSSY_YELLOW_BRICKS = new Block(FabricBlockSettings.copy(NSE_Blocks.YELLOW_BRICKS));
public static final StairsBlock MOSSY_YELLOW_BRICKS_STAIRS = new StairsBlock(MOSSY_YELLOW_BRICKS.getDefaultState(), FabricBlockSettings.copy(MOSSY_YELLOW_BRICKS));
public static final SlabBlock MOSSY_YELLOW_BRICKS_SLAB = new SlabBlock(FabricBlockSettings.copy(MOSSY_YELLOW_BRICKS));
public static final Block WHITEWASH = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).strength(1.5f, 6f).requiresTool().mapColor(MapColor.OFF_WHITE));
public static final Block CRACKED_WHITEWASH = new Block(FabricBlockSettings.copy(WHITEWASH));
@ -410,13 +401,13 @@ public class NSE_Blocks extends NSE_BaseRegistration {
public static final StairsBlock HERRINGBONE_BAMBOO_PLANKS_STAIRS = new StairsBlock(HERRINGBONE_BAMBOO_PLANKS.getDefaultState(), FabricBlockSettings.copy(HERRINGBONE_BAMBOO_PLANKS));
public static final SlabBlock HERRINGBONE_BAMBOO_PLANKS_SLAB = new SlabBlock(FabricBlockSettings.copy(HERRINGBONE_BAMBOO_PLANKS));
public static final Block HERRINGBONE_DARK_OAK_PARQUET = new Block(FabricBlockSettings.create().sounds(NSE_Sounds.PARQUET_SOUNDS).strength(2f, 3f).mapColor(MapColor.OAK_TAN));
public static final StairsBlock HERRINGBONE_DARK_OAK_PARQUET_STAIRS = new StairsBlock(HERRINGBONE_DARK_OAK_PARQUET.getDefaultState(), FabricBlockSettings.copy(HERRINGBONE_DARK_OAK_PARQUET));
public static final SlabBlock HERRINGBONE_DARK_OAK_PARQUET_SLAB = new SlabBlock(FabricBlockSettings.copy(HERRINGBONE_DARK_OAK_PARQUET));
public static final Block STRAIGHT_PARQUET = new Block(FabricBlockSettings.copy(HERRINGBONE_DARK_OAK_PARQUET));
public static final Block HERRINGBONE_PARQUET = new Block(FabricBlockSettings.create().sounds(NSE_Sounds.PARQUET_SOUNDS).strength(2f, 3f).mapColor(MapColor.OAK_TAN));
public static final StairsBlock HERRINGBONE_PARQUET_STAIRS = new StairsBlock(HERRINGBONE_PARQUET.getDefaultState(), FabricBlockSettings.copy(HERRINGBONE_PARQUET));
public static final SlabBlock HERRINGBONE_PARQUET_SLAB = new SlabBlock(FabricBlockSettings.copy(HERRINGBONE_PARQUET));
public static final Block STRAIGHT_PARQUET = new Block(FabricBlockSettings.copy(HERRINGBONE_PARQUET));
public static final StairsBlock STRAIGHT_PARQUET_STAIRS = new StairsBlock(STRAIGHT_PARQUET.getDefaultState(), FabricBlockSettings.copy(STRAIGHT_PARQUET));
public static final SlabBlock STRAIGHT_PARQUET_SLAB = new SlabBlock(FabricBlockSettings.copy(STRAIGHT_PARQUET));
public static final Block SEPARATED_PARQUET = new Block(FabricBlockSettings.copy(HERRINGBONE_DARK_OAK_PARQUET));
public static final Block SEPARATED_PARQUET = new Block(FabricBlockSettings.copy(HERRINGBONE_PARQUET));
public static final StairsBlock SEPARATED_PARQUET_STAIRS = new StairsBlock(SEPARATED_PARQUET.getDefaultState(), FabricBlockSettings.copy(SEPARATED_PARQUET));
public static final SlabBlock SEPARATED_PARQUET_SLAB = new SlabBlock(FabricBlockSettings.copy(SEPARATED_PARQUET));
@ -761,15 +752,6 @@ public class NSE_Blocks extends NSE_BaseRegistration {
registerBlock("small_yellow_tiles", () -> SMALL_YELLOW_TILES, NSE_BUILDING_TAB);
registerBlock("small_cracked_yellow_tiles", () -> SMALL_CRACKED_YELLOW_TILES, NSE_BUILDING_TAB);
registerBlock("yellow_bricks", () -> YELLOW_BRICKS, NSE_BUILDING_TAB);
registerBlock("yellow_bricks_stairs", () -> YELLOW_BRICKS_STAIRS, NSE_BUILDING_TAB);
registerBlock("yellow_bricks_slab", () -> YELLOW_BRICKS_SLAB, NSE_BUILDING_TAB);
registerBlock("cracked_yellow_bricks", () -> CRACKED_YELLOW_BRICKS, NSE_BUILDING_TAB);
registerBlock("cracked_yellow_bricks_stairs", () -> CRACKED_YELLOW_BRICKS_STAIRS, NSE_BUILDING_TAB);
registerBlock("cracked_yellow_bricks_slab", () -> CRACKED_YELLOW_BRICKS_SLAB, NSE_BUILDING_TAB);
registerBlock("mossy_yellow_bricks", () -> MOSSY_YELLOW_BRICKS, NSE_BUILDING_TAB);
registerBlock("mossy_yellow_bricks_stairs", () -> MOSSY_YELLOW_BRICKS_STAIRS, NSE_BUILDING_TAB);
registerBlock("mossy_yellow_bricks_slab", () -> MOSSY_YELLOW_BRICKS_SLAB, NSE_BUILDING_TAB);
registerBlock("whitewash", () -> WHITEWASH, NSE_BUILDING_TAB);
registerBlock("cracked_whitewash", () -> CRACKED_WHITEWASH, NSE_BUILDING_TAB);
@ -909,9 +891,9 @@ public class NSE_Blocks extends NSE_BaseRegistration {
registerBlock("herringbone_bamboo_planks_stairs", () -> HERRINGBONE_BAMBOO_PLANKS_STAIRS, NSE_BUILDING_TAB);
registerBlock("herringbone_bamboo_planks_slab", () -> HERRINGBONE_BAMBOO_PLANKS_SLAB, 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_slab", () -> HERRINGBONE_DARK_OAK_PARQUET_SLAB, NSE_BUILDING_TAB);
registerBlock("herringbone_parquet", () -> HERRINGBONE_PARQUET, NSE_BUILDING_TAB);
registerBlock("herringbone_parquet_stairs", () -> HERRINGBONE_PARQUET_STAIRS, NSE_BUILDING_TAB);
registerBlock("herringbone_parquet_slab", () -> HERRINGBONE_PARQUET_SLAB, NSE_BUILDING_TAB);
registerBlock("straight_parquet", () -> STRAIGHT_PARQUET, NSE_BUILDING_TAB);
registerBlock("straight_parquet_stairs", () -> STRAIGHT_PARQUET_STAIRS, NSE_BUILDING_TAB);
registerBlock("straight_parquet_slab", () -> STRAIGHT_PARQUET_SLAB, NSE_BUILDING_TAB);
@ -1026,7 +1008,7 @@ public class NSE_Blocks extends NSE_BaseRegistration {
flammableBlockRegistry.add(CROSS_CHERRY_PLANKS, 20, 5);
flammableBlockRegistry.add(HERRINGBONE_BAMBOO_PLANKS, 20, 5);
flammableBlockRegistry.add(HERRINGBONE_DARK_OAK_PARQUET, 20, 5);
flammableBlockRegistry.add(HERRINGBONE_PARQUET, 20, 5);
flammableBlockRegistry.add(STRAIGHT_PARQUET, 20, 5);
flammableBlockRegistry.add(SEPARATED_PARQUET, 20, 5);
@ -1075,8 +1057,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_STAIRS, 20, 5);
flammableBlockRegistry.add(HERRINGBONE_DARK_OAK_PARQUET_SLAB, 20, 5);
flammableBlockRegistry.add(HERRINGBONE_PARQUET_STAIRS, 20, 5);
flammableBlockRegistry.add(HERRINGBONE_PARQUET_SLAB, 20, 5);
flammableBlockRegistry.add(STRAIGHT_PARQUET_STAIRS, 20, 5);
flammableBlockRegistry.add(STRAIGHT_PARQUET_SLAB, 20, 5);
flammableBlockRegistry.add(SEPARATED_PARQUET_STAIRS, 20, 5);

2
src/main/resources/assets/new_soviet/blockstates/ap_landmine.json
View file

@ -5,4 +5,4 @@
"facing=south": { "model": "new_soviet:block/landmine", "y": 180, "uvlock": false },
"facing=west": { "model": "new_soviet:block/landmine", "y": 270, "uvlock": false }
}
}
}

64
src/main/resources/assets/new_soviet/blockstates/beige_concrete_with_bars.json
View file

@ -1,60 +1,12 @@
{
"variants": {
"face=ceiling,facing=north": {
"model": "new_soviet:block/concrete_with_bars/beige_concrete_with_bars",
"x": 180,
"y": 0
},
"face=ceiling,facing=east": {
"model": "new_soviet:block/concrete_with_bars/beige_concrete_with_bars",
"x": 180,
"y": 90
},
"face=ceiling,facing=south": {
"model": "new_soviet:block/concrete_with_bars/beige_concrete_with_bars",
"x": 180,
"y": 180
},
"face=ceiling,facing=west": {
"model": "new_soviet:block/concrete_with_bars/beige_concrete_with_bars",
"x": 180,
"y": 270
},
"face=floor,facing=north": {
"model": "new_soviet:block/concrete_with_bars/beige_concrete_with_bars",
"y": 0
},
"face=floor,facing=east": {
"model": "new_soviet:block/concrete_with_bars/beige_concrete_with_bars",
"y": 90
},
"face=floor,facing=south": {
"model": "new_soviet:block/concrete_with_bars/beige_concrete_with_bars",
"y": 180
},
"face=floor,facing=west": {
"model": "new_soviet:block/concrete_with_bars/beige_concrete_with_bars",
"y": 270
},
"face=wall,facing=north": {
"model": "new_soviet:block/concrete_with_bars/beige_concrete_with_bars",
"x": 90,
"y": 0
},
"face=wall,facing=east": {
"model": "new_soviet:block/concrete_with_bars/beige_concrete_with_bars",
"x": 90,
"y": 90
},
"face=wall,facing=south": {
"model": "new_soviet:block/concrete_with_bars/beige_concrete_with_bars",
"x": 90,
"y": 180
},
"face=wall,facing=west": {
"model": "new_soviet:block/concrete_with_bars/beige_concrete_with_bars",
"x": 90,
"y": 270
}
"facing=north,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/beige_concrete_with_bars", "uvlock": false },
"facing=east,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/beige_concrete_with_bars", "y": 90, "uvlock": false },
"facing=south,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/beige_concrete_with_bars", "y": 180, "uvlock": false },
"facing=west,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/beige_concrete_with_bars", "y": 270, "uvlock": false },
"facing=north,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/beige_concrete_with_bars", "x": 180, "uvlock": false },
"facing=east,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/beige_concrete_with_bars", "x": 180, "y": 90, "uvlock": false },
"facing=south,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/beige_concrete_with_bars", "x": 180, "y": 180, "uvlock": false },
"facing=west,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/beige_concrete_with_bars", "x": 180, "y": 270, "uvlock": false }
}
}

66
src/main/resources/assets/new_soviet/blockstates/blue_concrete_with_bars.json
View file

@ -1,60 +1,12 @@
{
"variants": {
"face=ceiling,facing=north": {
"model": "new_soviet:block/concrete_with_bars/blue_concrete_with_bars",
"x": 180,
"y": 0
},
"face=ceiling,facing=east": {
"model": "new_soviet:block/concrete_with_bars/blue_concrete_with_bars",
"x": 180,
"y": 90
},
"face=ceiling,facing=south": {
"model": "new_soviet:block/concrete_with_bars/blue_concrete_with_bars",
"x": 180,
"y": 180
},
"face=ceiling,facing=west": {
"model": "new_soviet:block/concrete_with_bars/blue_concrete_with_bars",
"x": 180,
"y": 270
},
"face=floor,facing=north": {
"model": "new_soviet:block/concrete_with_bars/blue_concrete_with_bars",
"y": 0
},
"face=floor,facing=east": {
"model": "new_soviet:block/concrete_with_bars/blue_concrete_with_bars",
"y": 90
},
"face=floor,facing=south": {
"model": "new_soviet:block/concrete_with_bars/blue_concrete_with_bars",
"y": 180
},
"face=floor,facing=west": {
"model": "new_soviet:block/concrete_with_bars/blue_concrete_with_bars",
"y": 270
},
"face=wall,facing=north": {
"model": "new_soviet:block/concrete_with_bars/blue_concrete_with_bars",
"x": 90,
"y": 0
},
"face=wall,facing=east": {
"model": "new_soviet:block/concrete_with_bars/blue_concrete_with_bars",
"x": 90,
"y": 90
},
"face=wall,facing=south": {
"model": "new_soviet:block/concrete_with_bars/blue_concrete_with_bars",
"x": 90,
"y": 180
},
"face=wall,facing=west": {
"model": "new_soviet:block/concrete_with_bars/blue_concrete_with_bars",
"x": 90,
"y": 270
}
"facing=north,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/blue_concrete_with_bars", "uvlock": false },
"facing=east,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/blue_concrete_with_bars", "y": 90, "uvlock": false },
"facing=south,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/blue_concrete_with_bars", "y": 180, "uvlock": false },
"facing=west,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/blue_concrete_with_bars", "y": 270, "uvlock": false },
"facing=north,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/blue_concrete_with_bars", "x": 180, "uvlock": false },
"facing=east,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/blue_concrete_with_bars", "x": 180, "y": 90, "uvlock": false },
"facing=south,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/blue_concrete_with_bars", "x": 180, "y": 180, "uvlock": false },
"facing=west,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/blue_concrete_with_bars", "x": 180, "y": 270, "uvlock": false }
}
}
}

64
src/main/resources/assets/new_soviet/blockstates/concrete_with_bars.json
View file

@ -1,60 +1,12 @@
{
"variants": {
"face=ceiling,facing=north": {
"model": "new_soviet:block/concrete_with_bars/concrete_with_bars",
"x": 180,
"y": 0
},
"face=ceiling,facing=east": {
"model": "new_soviet:block/concrete_with_bars/concrete_with_bars",
"x": 180,
"y": 90
},
"face=ceiling,facing=south": {
"model": "new_soviet:block/concrete_with_bars/concrete_with_bars",
"x": 180,
"y": 180
},
"face=ceiling,facing=west": {
"model": "new_soviet:block/concrete_with_bars/concrete_with_bars",
"x": 180,
"y": 270
},
"face=floor,facing=north": {
"model": "new_soviet:block/concrete_with_bars/concrete_with_bars",
"y": 0
},
"face=floor,facing=east": {
"model": "new_soviet:block/concrete_with_bars/concrete_with_bars",
"y": 90
},
"face=floor,facing=south": {
"model": "new_soviet:block/concrete_with_bars/concrete_with_bars",
"y": 180
},
"face=floor,facing=west": {
"model": "new_soviet:block/concrete_with_bars/concrete_with_bars",
"y": 270
},
"face=wall,facing=north": {
"model": "new_soviet:block/concrete_with_bars/concrete_with_bars",
"x": 90,
"y": 0
},
"face=wall,facing=east": {
"model": "new_soviet:block/concrete_with_bars/concrete_with_bars",
"x": 90,
"y": 90
},
"face=wall,facing=south": {
"model": "new_soviet:block/concrete_with_bars/concrete_with_bars",
"x": 90,
"y": 180
},
"face=wall,facing=west": {
"model": "new_soviet:block/concrete_with_bars/concrete_with_bars",
"x": 90,
"y": 270
}
"facing=north,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/concrete_with_bars", "uvlock": false },
"facing=east,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/concrete_with_bars", "y": 90, "uvlock": false },
"facing=south,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/concrete_with_bars", "y": 180, "uvlock": false },
"facing=west,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/concrete_with_bars", "y": 270, "uvlock": false },
"facing=north,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/concrete_with_bars", "x": 180, "uvlock": false },
"facing=east,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/concrete_with_bars", "x": 180, "y": 90, "uvlock": false },
"facing=south,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/concrete_with_bars", "x": 180, "y": 180, "uvlock": false },
"facing=west,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/concrete_with_bars", "x": 180, "y": 270, "uvlock": false }
}
}

64
src/main/resources/assets/new_soviet/blockstates/dark_green_concrete_with_bars.json
View file

@ -1,60 +1,12 @@
{
"variants": {
"face=ceiling,facing=north": {
"model": "new_soviet:block/concrete_with_bars/dark_green_concrete_with_bars",
"x": 180,
"y": 0
},
"face=ceiling,facing=east": {
"model": "new_soviet:block/concrete_with_bars/dark_green_concrete_with_bars",
"x": 180,
"y": 90
},
"face=ceiling,facing=south": {
"model": "new_soviet:block/concrete_with_bars/dark_green_concrete_with_bars",
"x": 180,
"y": 180
},
"face=ceiling,facing=west": {
"model": "new_soviet:block/concrete_with_bars/dark_green_concrete_with_bars",
"x": 180,
"y": 270
},
"face=floor,facing=north": {
"model": "new_soviet:block/concrete_with_bars/dark_green_concrete_with_bars",
"y": 0
},
"face=floor,facing=east": {
"model": "new_soviet:block/concrete_with_bars/dark_green_concrete_with_bars",
"y": 90
},
"face=floor,facing=south": {
"model": "new_soviet:block/concrete_with_bars/dark_green_concrete_with_bars",
"y": 180
},
"face=floor,facing=west": {
"model": "new_soviet:block/concrete_with_bars/dark_green_concrete_with_bars",
"y": 270
},
"face=wall,facing=north": {
"model": "new_soviet:block/concrete_with_bars/dark_green_concrete_with_bars",
"x": 90,
"y": 0
},
"face=wall,facing=east": {
"model": "new_soviet:block/concrete_with_bars/dark_green_concrete_with_bars",
"x": 90,
"y": 90
},
"face=wall,facing=south": {
"model": "new_soviet:block/concrete_with_bars/dark_green_concrete_with_bars",
"x": 90,
"y": 180
},
"face=wall,facing=west": {
"model": "new_soviet:block/concrete_with_bars/dark_green_concrete_with_bars",
"x": 90,
"y": 270
}
"facing=north,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/dark_green_concrete_with_bars", "uvlock": false },
"facing=east,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/dark_green_concrete_with_bars", "y": 90, "uvlock": false },
"facing=south,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/dark_green_concrete_with_bars", "y": 180, "uvlock": false },
"facing=west,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/dark_green_concrete_with_bars", "y": 270, "uvlock": false },
"facing=north,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/dark_green_concrete_with_bars", "x": 180, "uvlock": false },
"facing=east,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/dark_green_concrete_with_bars", "x": 180, "y": 90, "uvlock": false },
"facing=south,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/dark_green_concrete_with_bars", "x": 180, "y": 180, "uvlock": false },
"facing=west,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/dark_green_concrete_with_bars", "x": 180, "y": 270, "uvlock": false }
}
}

64
src/main/resources/assets/new_soviet/blockstates/green_concrete_with_bars.json
View file

@ -1,60 +1,12 @@
{
"variants": {
"face=ceiling,facing=north": {
"model": "new_soviet:block/concrete_with_bars/green_concrete_with_bars",
"x": 180,
"y": 0
},
"face=ceiling,facing=east": {
"model": "new_soviet:block/concrete_with_bars/green_concrete_with_bars",
"x": 180,
"y": 90
},
"face=ceiling,facing=south": {
"model": "new_soviet:block/concrete_with_bars/green_concrete_with_bars",
"x": 180,
"y": 180
},
"face=ceiling,facing=west": {
"model": "new_soviet:block/concrete_with_bars/green_concrete_with_bars",
"x": 180,
"y": 270
},
"face=floor,facing=north": {
"model": "new_soviet:block/concrete_with_bars/green_concrete_with_bars",
"y": 0
},
"face=floor,facing=east": {
"model": "new_soviet:block/concrete_with_bars/green_concrete_with_bars",
"y": 90
},
"face=floor,facing=south": {
"model": "new_soviet:block/concrete_with_bars/green_concrete_with_bars",
"y": 180
},
"face=floor,facing=west": {
"model": "new_soviet:block/concrete_with_bars/green_concrete_with_bars",
"y": 270
},
"face=wall,facing=north": {
"model": "new_soviet:block/concrete_with_bars/green_concrete_with_bars",
"x": 90,
"y": 0
},
"face=wall,facing=east": {
"model": "new_soviet:block/concrete_with_bars/green_concrete_with_bars",
"x": 90,
"y": 90
},
"face=wall,facing=south": {
"model": "new_soviet:block/concrete_with_bars/green_concrete_with_bars",
"x": 90,
"y": 180
},
"face=wall,facing=west": {
"model": "new_soviet:block/concrete_with_bars/green_concrete_with_bars",
"x": 90,
"y": 270
}
"facing=north,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/green_concrete_with_bars", "uvlock": false },
"facing=east,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/green_concrete_with_bars", "y": 90, "uvlock": false },
"facing=south,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/green_concrete_with_bars", "y": 180, "uvlock": false },
"facing=west,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/green_concrete_with_bars", "y": 270, "uvlock": false },
"facing=north,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/green_concrete_with_bars", "x": 180, "uvlock": false },
"facing=east,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/green_concrete_with_bars", "x": 180, "y": 90, "uvlock": false },
"facing=south,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/green_concrete_with_bars", "x": 180, "y": 180, "uvlock": false },
"facing=west,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/green_concrete_with_bars", "x": 180, "y": 270, "uvlock": false }
}
}

64
src/main/resources/assets/new_soviet/blockstates/orange_concrete_with_bars.json
View file

@ -1,60 +1,12 @@
{
"variants": {
"face=ceiling,facing=north": {
"model": "new_soviet:block/concrete_with_bars/orange_concrete_with_bars",
"x": 180,
"y": 0
},
"face=ceiling,facing=east": {
"model": "new_soviet:block/concrete_with_bars/orange_concrete_with_bars",
"x": 180,
"y": 90
},
"face=ceiling,facing=south": {
"model": "new_soviet:block/concrete_with_bars/orange_concrete_with_bars",
"x": 180,
"y": 180
},
"face=ceiling,facing=west": {
"model": "new_soviet:block/concrete_with_bars/orange_concrete_with_bars",
"x": 180,
"y": 270
},
"face=floor,facing=north": {
"model": "new_soviet:block/concrete_with_bars/orange_concrete_with_bars",
"y": 0
},
"face=floor,facing=east": {
"model": "new_soviet:block/concrete_with_bars/orange_concrete_with_bars",
"y": 90
},
"face=floor,facing=south": {
"model": "new_soviet:block/concrete_with_bars/orange_concrete_with_bars",
"y": 180
},
"face=floor,facing=west": {
"model": "new_soviet:block/concrete_with_bars/orange_concrete_with_bars",
"y": 270
},
"face=wall,facing=north": {
"model": "new_soviet:block/concrete_with_bars/orange_concrete_with_bars",
"x": 90,
"y": 0
},
"face=wall,facing=east": {
"model": "new_soviet:block/concrete_with_bars/orange_concrete_with_bars",
"x": 90,
"y": 90
},
"face=wall,facing=south": {
"model": "new_soviet:block/concrete_with_bars/orange_concrete_with_bars",
"x": 90,
"y": 180
},
"face=wall,facing=west": {
"model": "new_soviet:block/concrete_with_bars/orange_concrete_with_bars",
"x": 90,
"y": 270
}
"facing=north,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/orange_concrete_with_bars", "uvlock": false },
"facing=east,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/orange_concrete_with_bars", "y": 90, "uvlock": false },
"facing=south,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/orange_concrete_with_bars", "y": 180, "uvlock": false },
"facing=west,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/orange_concrete_with_bars", "y": 270, "uvlock": false },
"facing=north,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/orange_concrete_with_bars", "x": 180, "uvlock": false },
"facing=east,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/orange_concrete_with_bars", "x": 180, "y": 90, "uvlock": false },
"facing=south,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/orange_concrete_with_bars", "x": 180, "y": 180, "uvlock": false },
"facing=west,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/orange_concrete_with_bars", "x": 180, "y": 270, "uvlock": false }
}
}

64
src/main/resources/assets/new_soviet/blockstates/red_concrete_with_bars.json
View file

@ -1,60 +1,12 @@
{
"variants": {
"face=ceiling,facing=north": {
"model": "new_soviet:block/concrete_with_bars/red_concrete_with_bars",
"x": 180,
"y": 0
},
"face=ceiling,facing=east": {
"model": "new_soviet:block/concrete_with_bars/red_concrete_with_bars",
"x": 180,
"y": 90
},
"face=ceiling,facing=south": {
"model": "new_soviet:block/concrete_with_bars/red_concrete_with_bars",
"x": 180,
"y": 180
},
"face=ceiling,facing=west": {
"model": "new_soviet:block/concrete_with_bars/red_concrete_with_bars",
"x": 180,
"y": 270
},
"face=floor,facing=north": {
"model": "new_soviet:block/concrete_with_bars/red_concrete_with_bars",
"y": 0
},
"face=floor,facing=east": {
"model": "new_soviet:block/concrete_with_bars/red_concrete_with_bars",
"y": 90
},
"face=floor,facing=south": {
"model": "new_soviet:block/concrete_with_bars/red_concrete_with_bars",
"y": 180
},
"face=floor,facing=west": {
"model": "new_soviet:block/concrete_with_bars/red_concrete_with_bars",
"y": 270
},
"face=wall,facing=north": {
"model": "new_soviet:block/concrete_with_bars/red_concrete_with_bars",
"x": 90,
"y": 0
},
"face=wall,facing=east": {
"model": "new_soviet:block/concrete_with_bars/red_concrete_with_bars",
"x": 90,
"y": 90
},
"face=wall,facing=south": {
"model": "new_soviet:block/concrete_with_bars/red_concrete_with_bars",
"x": 90,
"y": 180
},
"face=wall,facing=west": {
"model": "new_soviet:block/concrete_with_bars/red_concrete_with_bars",
"x": 90,
"y": 270
}
"facing=north,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/red_concrete_with_bars", "uvlock": false },
"facing=east,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/red_concrete_with_bars", "y": 90, "uvlock": false },
"facing=south,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/red_concrete_with_bars", "y": 180, "uvlock": false },
"facing=west,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/red_concrete_with_bars", "y": 270, "uvlock": false },
"facing=north,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/red_concrete_with_bars", "x": 180, "uvlock": false },
"facing=east,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/red_concrete_with_bars", "x": 180, "y": 90, "uvlock": false },
"facing=south,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/red_concrete_with_bars", "x": 180, "y": 180, "uvlock": false },
"facing=west,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/red_concrete_with_bars", "x": 180, "y": 270, "uvlock": false }
}
}

64
src/main/resources/assets/new_soviet/blockstates/white_concrete_with_bars.json
View file

@ -1,60 +1,12 @@
{
"variants": {
"face=ceiling,facing=north": {
"model": "new_soviet:block/concrete_with_bars/white_concrete_with_bars",
"x": 180,
"y": 0
},
"face=ceiling,facing=east": {
"model": "new_soviet:block/concrete_with_bars/white_concrete_with_bars",
"x": 180,
"y": 90
},
"face=ceiling,facing=south": {
"model": "new_soviet:block/concrete_with_bars/white_concrete_with_bars",
"x": 180,
"y": 180
},
"face=ceiling,facing=west": {
"model": "new_soviet:block/concrete_with_bars/white_concrete_with_bars",
"x": 180,
"y": 270
},
"face=floor,facing=north": {
"model": "new_soviet:block/concrete_with_bars/white_concrete_with_bars",
"y": 0
},
"face=floor,facing=east": {
"model": "new_soviet:block/concrete_with_bars/white_concrete_with_bars",
"y": 90
},
"face=floor,facing=south": {
"model": "new_soviet:block/concrete_with_bars/white_concrete_with_bars",
"y": 180
},
"face=floor,facing=west": {
"model": "new_soviet:block/concrete_with_bars/white_concrete_with_bars",
"y": 270
},
"face=wall,facing=north": {
"model": "new_soviet:block/concrete_with_bars/white_concrete_with_bars",
"x": 90,
"y": 0
},
"face=wall,facing=east": {
"model": "new_soviet:block/concrete_with_bars/white_concrete_with_bars",
"x": 90,
"y": 90
},
"face=wall,facing=south": {
"model": "new_soviet:block/concrete_with_bars/white_concrete_with_bars",
"x": 90,
"y": 180
},
"face=wall,facing=west": {
"model": "new_soviet:block/concrete_with_bars/white_concrete_with_bars",
"x": 90,
"y": 270
}
"facing=north,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/white_concrete_with_bars", "uvlock": false },
"facing=east,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/white_concrete_with_bars", "y": 90, "uvlock": false },
"facing=south,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/white_concrete_with_bars", "y": 180, "uvlock": false },
"facing=west,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/white_concrete_with_bars", "y": 270, "uvlock": false },
"facing=north,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/white_concrete_with_bars", "x": 180, "uvlock": false },
"facing=east,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/white_concrete_with_bars", "x": 180, "y": 90, "uvlock": false },
"facing=south,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/white_concrete_with_bars", "x": 180, "y": 180, "uvlock": false },
"facing=west,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/white_concrete_with_bars", "x": 180, "y": 270, "uvlock": false }
}
}

64
src/main/resources/assets/new_soviet/blockstates/yellow_concrete_with_bars.json
View file

@ -1,60 +1,12 @@
{
"variants": {
"face=ceiling,facing=north": {
"model": "new_soviet:block/concrete_with_bars/yellow_concrete_with_bars",
"x": 180,
"y": 0
},
"face=ceiling,facing=east": {
"model": "new_soviet:block/concrete_with_bars/yellow_concrete_with_bars",
"x": 180,
"y": 90
},
"face=ceiling,facing=south": {
"model": "new_soviet:block/concrete_with_bars/yellow_concrete_with_bars",
"x": 180,
"y": 180
},
"face=ceiling,facing=west": {
"model": "new_soviet:block/concrete_with_bars/yellow_concrete_with_bars",
"x": 180,
"y": 270
},
"face=floor,facing=north": {
"model": "new_soviet:block/concrete_with_bars/yellow_concrete_with_bars",
"y": 0
},
"face=floor,facing=east": {
"model": "new_soviet:block/concrete_with_bars/yellow_concrete_with_bars",
"y": 90
},
"face=floor,facing=south": {
"model": "new_soviet:block/concrete_with_bars/yellow_concrete_with_bars",
"y": 180
},
"face=floor,facing=west": {
"model": "new_soviet:block/concrete_with_bars/yellow_concrete_with_bars",
"y": 270
},
"face=wall,facing=north": {
"model": "new_soviet:block/concrete_with_bars/yellow_concrete_with_bars",
"x": 90,
"y": 0
},
"face=wall,facing=east": {
"model": "new_soviet:block/concrete_with_bars/yellow_concrete_with_bars",
"x": 90,
"y": 90
},
"face=wall,facing=south": {
"model": "new_soviet:block/concrete_with_bars/yellow_concrete_with_bars",
"x": 90,
"y": 180
},
"face=wall,facing=west": {
"model": "new_soviet:block/concrete_with_bars/yellow_concrete_with_bars",
"x": 90,
"y": 270
}
"facing=north,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/yellow_concrete_with_bars", "uvlock": false },
"facing=east,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/yellow_concrete_with_bars", "y": 90, "uvlock": false },
"facing=south,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/yellow_concrete_with_bars", "y": 180, "uvlock": false },
"facing=west,vertical_direction=up": { "model": "new_soviet:block/concrete_with_bars/yellow_concrete_with_bars", "y": 270, "uvlock": false },
"facing=north,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/yellow_concrete_with_bars", "x": 180, "uvlock": false },
"facing=east,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/yellow_concrete_with_bars", "x": 180, "y": 90, "uvlock": false },
"facing=south,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/yellow_concrete_with_bars", "x": 180, "y": 180, "uvlock": false },
"facing=west,vertical_direction=down": { "model": "new_soviet:block/concrete_with_bars/yellow_concrete_with_bars", "x": 180, "y": 270, "uvlock": false }
}
}

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

@ -131,7 +131,7 @@
"block.new_soviet.cross_mangrove_planks": "Мангровый паркѣтъ «крѣстиком»",
"block.new_soviet.herringbone_spruce_planks": "Еловый паркѣтъ «ёлочкой»",
"block.new_soviet.cross_spruce_planks": "Еловый паркѣтъ «крѣстиком»",
"block.new_soviet.herringbone_dark_oak_parquet": "Паркѣтъ из тѣмнаго дуба «ёлочкой»",
"block.new_soviet.herringbone_parquet": "Паркѣтъ «ёлочкой»",
"block.new_soviet.straight_parquet": "Прямой паркѣт",
"block.new_soviet.separated_parquet": "Раздѣлённый паркѣт",
"block.new_soviet.green_linoleum": "Зѣлёный линолѣум",
@ -148,7 +148,6 @@
"block.new_soviet.tv": "Оранжѣвый тѣлѣвизоръ «Рѣкордъ В-312»",
"block.new_soviet.red_tv": "Червонный тѣлѣвизоръ «Рѣкордъ В-312»",
"block.new_soviet.brown_tv": "Корiчнѣвый тѣлѣвизоръ «Рѣкордъ В-312»",
"block.new_soviet.green_tv": "Зѣлёный тѣлѣвизоръ «Рѣкордъ В-312»",
"block.new_soviet.radio_receiver": "Радiопрiямнiкъ «Альпинiст»",
"block.new_soviet.table_lamp": "Настольныя лампа",
"block.new_soviet.ceiling_fan": "Потолочный вѣнтилятор",
@ -425,8 +424,8 @@
"block.new_soviet.herringbone_spruce_planks_stairs": "Ступѣнi из еловаго паркѣта «ёлочкой»",
"block.new_soviet.cross_spruce_planks_slab": "Плита из еловаго паркѣта «крѣстиком»",
"block.new_soviet.cross_spruce_planks_stairs": "Ступѣнi из еловаго паркѣта «крѣстиком»",
"block.new_soviet.herringbone_dark_oak_parquet_slab": "Плита из паркѣта тѣмнаго дуба «ёлочкой»",
"block.new_soviet.herringbone_dark_oak_parquet_stairs": "Ступѣнi из паркѣта тѣмнаго дуба «ёлочкой»",
"block.new_soviet.herringbone_parquet_slab": "Плита из паркѣта «ёлочкой»",
"block.new_soviet.herringbone_parquet_stairs": "Ступѣнi из паркѣта «ёлочкой»",
"block.new_soviet.straight_parquet_slab": "Плита из прямаго паркѣта",
"block.new_soviet.straight_parquet_stairs": "Ступѣнi из прямаго паркѣта",
"block.new_soviet.separated_parquet_slab": "Плита из раздѣлённаго паркѣта",

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

@ -131,7 +131,7 @@
"block.new_soviet.cross_mangrove_planks": "Мангровый паркет «крестиком»",
"block.new_soviet.herringbone_spruce_planks": "Еловый паркет «ёлочкой»",
"block.new_soviet.cross_spruce_planks": "Еловый паркет «крестиком»",
"block.new_soviet.herringbone_dark_oak_parquet": "Паркет из тёмного дуба «ёлочкой»",
"block.new_soviet.herringbone_parquet": "Паркет «ёлочкой»",
"block.new_soviet.straight_parquet": "Прямой паркет",
"block.new_soviet.separated_parquet": "Разделённый паркет",
"block.new_soviet.green_linoleum": "Зелёный линолеум",
@ -148,7 +148,6 @@
"block.new_soviet.tv": "Оранжевый телевизор «Рекорд В-312»",
"block.new_soviet.red_tv": "Красный телевизор «Рекорд В-312»",
"block.new_soviet.brown_tv": "Коричневый телевизор «Рекорд В-312»",
"block.new_soviet.green_tv": "Зелёный телевизор «Рекорд В-312»",
"block.new_soviet.radio_receiver": "Радиоприёмник «Альпинист»",
"block.new_soviet.table_lamp": "Настольная лампа",
"block.new_soviet.ceiling_fan": "Потолочный вентилятор",
@ -446,8 +445,8 @@
"block.new_soviet.herringbone_spruce_planks_stairs": "Ступени из елового паркета «ёлочкой»",
"block.new_soviet.cross_spruce_planks_slab": "Плита из елового паркета «крестиком»",
"block.new_soviet.cross_spruce_planks_stairs": "Ступени из елового паркета «крестиком»",
"block.new_soviet.herringbone_dark_oak_parquet_slab": "Плита из тёмно дубового паркета «ёлочкой»",
"block.new_soviet.herringbone_dark_oak_parquet_stairs": "Ступени из тёмно дубового паркета «ёлочкой»",
"block.new_soviet.herringbone_parquet_slab": "Плита из паркета «ёлочкой»",
"block.new_soviet.herringbone_parquet_stairs": "Ступени из паркета «ёлочкой»",
"block.new_soviet.straight_parquet_slab": "Плита из прямого паркета",
"block.new_soviet.straight_parquet_stairs": "Ступени из прямого паркета",
"block.new_soviet.separated_parquet_slab": "Плита из разделённого паркета",

BIN
src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/tv_screen_noise.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 606 B

2
src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/tv_screen_noise.png.mcmeta
View file

@ -2,6 +2,6 @@
"animation": {
"frametime": 2,
"interpolate": false,
"frames": [1, 2, 5, 4, 3, 4, 3, 4, 3, 4, 3, 4, 5, 2, 1]
"frames": [0, 1, 2]
}
}

0
src/main/resources/assets/new_soviet/textures/block/floor/planks/herringbone_dark_oak_parquet.png → src/main/resources/assets/new_soviet/textures/block/floor/planks/herringbone_parquet.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 807 B

After

Width:  |  Height:  |  Size: 807 B

0
src/main/resources/assets/new_soviet/textures/block/floor/planks/separated_oak_parquet.png → src/main/resources/assets/new_soviet/textures/block/floor/planks/separated_parquet.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 826 B

After

Width:  |  Height:  |  Size: 826 B

BIN
src/main/resources/assets/new_soviet/textures/block/floor/planks/spruce_herringbone_parquet.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 508 B

0
src/main/resources/assets/new_soviet/textures/block/floor/planks/straight_oak_parquet.png → src/main/resources/assets/new_soviet/textures/block/floor/planks/straight_parquet.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 805 B

After

Width:  |  Height:  |  Size: 805 B

BIN
src/main/resources/assets/new_soviet/textures/block/green_white/cracked_green_white_tiles.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 529 B

After

Width:  |  Height:  |  Size: 593 B

BIN
src/main/resources/assets/new_soviet/textures/block/green_white/green_white_tiles.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 379 B

After

Width:  |  Height:  |  Size: 396 B

BIN
src/main/resources/assets/new_soviet/textures/block/green_white/mossy_green_white_tiles.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 664 B

After

Width:  |  Height:  |  Size: 771 B