diff --git a/src/main/generated/assets/new_soviet/blockstates/herringbone_dark_oak_parquet.json b/src/main/generated/assets/new_soviet/blockstates/herringbone_dark_oak_parquet.json new file mode 100644 index 0000000..e6cde63 --- /dev/null +++ b/src/main/generated/assets/new_soviet/blockstates/herringbone_dark_oak_parquet.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/herringbone_dark_oak_parquet" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/blockstates/herringbone_dark_oak_parquet_slab.json b/src/main/generated/assets/new_soviet/blockstates/herringbone_dark_oak_parquet_slab.json new file mode 100644 index 0000000..bb71a55 --- /dev/null +++ b/src/main/generated/assets/new_soviet/blockstates/herringbone_dark_oak_parquet_slab.json @@ -0,0 +1,13 @@ +{ + "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" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/blockstates/herringbone_parquet_stairs.json b/src/main/generated/assets/new_soviet/blockstates/herringbone_dark_oak_parquet_stairs.json similarity index 55% rename from src/main/generated/assets/new_soviet/blockstates/herringbone_parquet_stairs.json rename to src/main/generated/assets/new_soviet/blockstates/herringbone_dark_oak_parquet_stairs.json index f643ea4..a593196 100644 --- a/src/main/generated/assets/new_soviet/blockstates/herringbone_parquet_stairs.json +++ b/src/main/generated/assets/new_soviet/blockstates/herringbone_dark_oak_parquet_stairs.json @@ -1,206 +1,206 @@ { "variants": { "facing=east,half=bottom,shape=inner_left": { - "model": "new_soviet:block/herringbone_parquet_stairs_inner", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_inner", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=inner_right": { - "model": "new_soviet:block/herringbone_parquet_stairs_inner" + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_inner" }, "facing=east,half=bottom,shape=outer_left": { - "model": "new_soviet:block/herringbone_parquet_stairs_outer", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_outer", "uvlock": true, "y": 270 }, "facing=east,half=bottom,shape=outer_right": { - "model": "new_soviet:block/herringbone_parquet_stairs_outer" + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_outer" }, "facing=east,half=bottom,shape=straight": { - "model": "new_soviet:block/herringbone_parquet_stairs" + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs" }, "facing=east,half=top,shape=inner_left": { - "model": "new_soviet:block/herringbone_parquet_stairs_inner", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_inner", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=inner_right": { - "model": "new_soviet:block/herringbone_parquet_stairs_inner", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=outer_left": { - "model": "new_soviet:block/herringbone_parquet_stairs_outer", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_outer", "uvlock": true, "x": 180 }, "facing=east,half=top,shape=outer_right": { - "model": "new_soviet:block/herringbone_parquet_stairs_outer", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=east,half=top,shape=straight": { - "model": "new_soviet:block/herringbone_parquet_stairs", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs", "uvlock": true, "x": 180 }, "facing=north,half=bottom,shape=inner_left": { - "model": "new_soviet:block/herringbone_parquet_stairs_inner", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_inner", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=inner_right": { - "model": "new_soviet:block/herringbone_parquet_stairs_inner", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_inner", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=outer_left": { - "model": "new_soviet:block/herringbone_parquet_stairs_outer", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_outer", "uvlock": true, "y": 180 }, "facing=north,half=bottom,shape=outer_right": { - "model": "new_soviet:block/herringbone_parquet_stairs_outer", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_outer", "uvlock": true, "y": 270 }, "facing=north,half=bottom,shape=straight": { - "model": "new_soviet:block/herringbone_parquet_stairs", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs", "uvlock": true, "y": 270 }, "facing=north,half=top,shape=inner_left": { - "model": "new_soviet:block/herringbone_parquet_stairs_inner", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=inner_right": { - "model": "new_soviet:block/herringbone_parquet_stairs_inner", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_inner", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=outer_left": { - "model": "new_soviet:block/herringbone_parquet_stairs_outer", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=north,half=top,shape=outer_right": { - "model": "new_soviet:block/herringbone_parquet_stairs_outer", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_outer", "uvlock": true, "x": 180 }, "facing=north,half=top,shape=straight": { - "model": "new_soviet:block/herringbone_parquet_stairs", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs", "uvlock": true, "x": 180, "y": 270 }, "facing=south,half=bottom,shape=inner_left": { - "model": "new_soviet:block/herringbone_parquet_stairs_inner" + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_inner" }, "facing=south,half=bottom,shape=inner_right": { - "model": "new_soviet:block/herringbone_parquet_stairs_inner", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_inner", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=outer_left": { - "model": "new_soviet:block/herringbone_parquet_stairs_outer" + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_outer" }, "facing=south,half=bottom,shape=outer_right": { - "model": "new_soviet:block/herringbone_parquet_stairs_outer", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_outer", "uvlock": true, "y": 90 }, "facing=south,half=bottom,shape=straight": { - "model": "new_soviet:block/herringbone_parquet_stairs", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs", "uvlock": true, "y": 90 }, "facing=south,half=top,shape=inner_left": { - "model": "new_soviet:block/herringbone_parquet_stairs_inner", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_inner", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=inner_right": { - "model": "new_soviet:block/herringbone_parquet_stairs_inner", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=outer_left": { - "model": "new_soviet:block/herringbone_parquet_stairs_outer", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_outer", "uvlock": true, "x": 180, "y": 90 }, "facing=south,half=top,shape=outer_right": { - "model": "new_soviet:block/herringbone_parquet_stairs_outer", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=south,half=top,shape=straight": { - "model": "new_soviet:block/herringbone_parquet_stairs", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs", "uvlock": true, "x": 180, "y": 90 }, "facing=west,half=bottom,shape=inner_left": { - "model": "new_soviet:block/herringbone_parquet_stairs_inner", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_inner", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=inner_right": { - "model": "new_soviet:block/herringbone_parquet_stairs_inner", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_inner", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=outer_left": { - "model": "new_soviet:block/herringbone_parquet_stairs_outer", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_outer", "uvlock": true, "y": 90 }, "facing=west,half=bottom,shape=outer_right": { - "model": "new_soviet:block/herringbone_parquet_stairs_outer", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_outer", "uvlock": true, "y": 180 }, "facing=west,half=bottom,shape=straight": { - "model": "new_soviet:block/herringbone_parquet_stairs", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs", "uvlock": true, "y": 180 }, "facing=west,half=top,shape=inner_left": { - "model": "new_soviet:block/herringbone_parquet_stairs_inner", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_inner", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=inner_right": { - "model": "new_soviet:block/herringbone_parquet_stairs_inner", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_inner", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=outer_left": { - "model": "new_soviet:block/herringbone_parquet_stairs_outer", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_outer", "uvlock": true, "x": 180, "y": 180 }, "facing=west,half=top,shape=outer_right": { - "model": "new_soviet:block/herringbone_parquet_stairs_outer", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs_outer", "uvlock": true, "x": 180, "y": 270 }, "facing=west,half=top,shape=straight": { - "model": "new_soviet:block/herringbone_parquet_stairs", + "model": "new_soviet:block/herringbone_dark_oak_parquet_stairs", "uvlock": true, "x": 180, "y": 180 diff --git a/src/main/generated/assets/new_soviet/blockstates/herringbone_parquet.json b/src/main/generated/assets/new_soviet/blockstates/herringbone_parquet.json deleted file mode 100644 index 4964600..0000000 --- a/src/main/generated/assets/new_soviet/blockstates/herringbone_parquet.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "new_soviet:block/herringbone_parquet" - } - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/blockstates/herringbone_parquet_slab.json b/src/main/generated/assets/new_soviet/blockstates/herringbone_parquet_slab.json deleted file mode 100644 index 8ae523c..0000000 --- a/src/main/generated/assets/new_soviet/blockstates/herringbone_parquet_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "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" - } - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_dark_oak_parquet.json b/src/main/generated/assets/new_soviet/models/block/herringbone_dark_oak_parquet.json new file mode 100644 index 0000000..0f78551 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/herringbone_dark_oak_parquet.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "new_soviet:block/floor/planks/herringbone_dark_oak_parquet" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_dark_oak_parquet_slab.json b/src/main/generated/assets/new_soviet/models/block/herringbone_dark_oak_parquet_slab.json new file mode 100644 index 0000000..c946cb5 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/herringbone_dark_oak_parquet_slab.json @@ -0,0 +1,8 @@ +{ + "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" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_dark_oak_parquet_slab_top.json b/src/main/generated/assets/new_soviet/models/block/herringbone_dark_oak_parquet_slab_top.json new file mode 100644 index 0000000..ccde62e --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/herringbone_dark_oak_parquet_slab_top.json @@ -0,0 +1,8 @@ +{ + "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" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_dark_oak_parquet_stairs.json b/src/main/generated/assets/new_soviet/models/block/herringbone_dark_oak_parquet_stairs.json new file mode 100644 index 0000000..8b5c298 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/herringbone_dark_oak_parquet_stairs.json @@ -0,0 +1,8 @@ +{ + "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" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_dark_oak_parquet_stairs_inner.json b/src/main/generated/assets/new_soviet/models/block/herringbone_dark_oak_parquet_stairs_inner.json new file mode 100644 index 0000000..2be0669 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/herringbone_dark_oak_parquet_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "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" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_dark_oak_parquet_stairs_outer.json b/src/main/generated/assets/new_soviet/models/block/herringbone_dark_oak_parquet_stairs_outer.json new file mode 100644 index 0000000..104f294 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/herringbone_dark_oak_parquet_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "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" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_parquet.json b/src/main/generated/assets/new_soviet/models/block/herringbone_parquet.json deleted file mode 100644 index 272867d..0000000 --- a/src/main/generated/assets/new_soviet/models/block/herringbone_parquet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/floor/planks/herringbone_parquet" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_parquet_slab.json b/src/main/generated/assets/new_soviet/models/block/herringbone_parquet_slab.json deleted file mode 100644 index 4ec8f19..0000000 --- a/src/main/generated/assets/new_soviet/models/block/herringbone_parquet_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "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" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_parquet_slab_top.json b/src/main/generated/assets/new_soviet/models/block/herringbone_parquet_slab_top.json deleted file mode 100644 index 516ffb5..0000000 --- a/src/main/generated/assets/new_soviet/models/block/herringbone_parquet_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "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" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_parquet_stairs.json b/src/main/generated/assets/new_soviet/models/block/herringbone_parquet_stairs.json deleted file mode 100644 index 00ee32b..0000000 --- a/src/main/generated/assets/new_soviet/models/block/herringbone_parquet_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "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" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_parquet_stairs_inner.json b/src/main/generated/assets/new_soviet/models/block/herringbone_parquet_stairs_inner.json deleted file mode 100644 index 25f1b49..0000000 --- a/src/main/generated/assets/new_soviet/models/block/herringbone_parquet_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "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" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_parquet_stairs_outer.json b/src/main/generated/assets/new_soviet/models/block/herringbone_parquet_stairs_outer.json deleted file mode 100644 index c29a6d7..0000000 --- a/src/main/generated/assets/new_soviet/models/block/herringbone_parquet_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "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" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/herringbone_dark_oak_parquet.json b/src/main/generated/assets/new_soviet/models/item/herringbone_dark_oak_parquet.json new file mode 100644 index 0000000..1bd58d7 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/item/herringbone_dark_oak_parquet.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/herringbone_dark_oak_parquet" +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/herringbone_dark_oak_parquet_slab.json b/src/main/generated/assets/new_soviet/models/item/herringbone_dark_oak_parquet_slab.json new file mode 100644 index 0000000..b3177c1 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/item/herringbone_dark_oak_parquet_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/herringbone_dark_oak_parquet_slab" +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/herringbone_dark_oak_parquet_stairs.json b/src/main/generated/assets/new_soviet/models/item/herringbone_dark_oak_parquet_stairs.json new file mode 100644 index 0000000..fe6b398 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/item/herringbone_dark_oak_parquet_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/herringbone_dark_oak_parquet_stairs" +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/herringbone_parquet.json b/src/main/generated/assets/new_soviet/models/item/herringbone_parquet.json deleted file mode 100644 index 40b1dc2..0000000 --- a/src/main/generated/assets/new_soviet/models/item/herringbone_parquet.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "new_soviet:block/herringbone_parquet" -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/herringbone_parquet_slab.json b/src/main/generated/assets/new_soviet/models/item/herringbone_parquet_slab.json deleted file mode 100644 index 0d442e8..0000000 --- a/src/main/generated/assets/new_soviet/models/item/herringbone_parquet_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "new_soviet:block/herringbone_parquet_slab" -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/herringbone_parquet_stairs.json b/src/main/generated/assets/new_soviet/models/item/herringbone_parquet_stairs.json deleted file mode 100644 index 4ad636b..0000000 --- a/src/main/generated/assets/new_soviet/models/item/herringbone_parquet_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "new_soviet:block/herringbone_parquet_stairs" -} \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/blocks/mineable/axe.json b/src/main/generated/data/minecraft/tags/blocks/mineable/axe.json index 78f5017..3fd25dc 100644 --- a/src/main/generated/data/minecraft/tags/blocks/mineable/axe.json +++ b/src/main/generated/data/minecraft/tags/blocks/mineable/axe.json @@ -21,7 +21,7 @@ "new_soviet:cross_mangrove_planks", "new_soviet:herringbone_spruce_planks", "new_soviet:cross_spruce_planks", - "new_soviet:herringbone_parquet", + "new_soviet:herringbone_dark_oak_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_parquet_stairs", - "new_soviet:herringbone_parquet_slab", + "new_soviet:herringbone_dark_oak_parquet_stairs", + "new_soviet:herringbone_dark_oak_parquet_slab", "new_soviet:straight_parquet_stairs", "new_soviet:straight_parquet_slab", "new_soviet:separated_parquet_stairs", diff --git a/src/main/generated/data/minecraft/tags/blocks/slabs.json b/src/main/generated/data/minecraft/tags/blocks/slabs.json index 314ec9f..3e1044d 100644 --- a/src/main/generated/data/minecraft/tags/blocks/slabs.json +++ b/src/main/generated/data/minecraft/tags/blocks/slabs.json @@ -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_parquet_slab", + "new_soviet:herringbone_dark_oak_parquet_slab", "new_soviet:straight_parquet_slab", "new_soviet:separated_parquet_slab", "new_soviet:green_linoleum_slab", diff --git a/src/main/generated/data/minecraft/tags/blocks/stairs.json b/src/main/generated/data/minecraft/tags/blocks/stairs.json index cf5a21f..2ff24a5 100644 --- a/src/main/generated/data/minecraft/tags/blocks/stairs.json +++ b/src/main/generated/data/minecraft/tags/blocks/stairs.json @@ -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_parquet_stairs", + "new_soviet:herringbone_dark_oak_parquet_stairs", "new_soviet:straight_parquet_stairs", "new_soviet:separated_parquet_stairs", "new_soviet:green_linoleum_stairs", diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_parquet_stairs.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_dark_oak_parquet_from_dark_oak_planks_stonecutting.json similarity index 63% rename from src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_parquet_stairs.json rename to src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_dark_oak_parquet_from_dark_oak_planks_stonecutting.json index d8e38a0..3d32d99 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_parquet_stairs.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_dark_oak_parquet_from_dark_oak_planks_stonecutting.json @@ -1,12 +1,12 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_herringbone_parquet": { + "has_dark_oak_planks": { "conditions": { "items": [ { "items": [ - "new_soviet:herringbone_parquet" + "minecraft:dark_oak_planks" ] } ] @@ -15,20 +15,20 @@ }, "has_the_recipe": { "conditions": { - "recipe": "new_soviet:herringbone_parquet_stairs" + "recipe": "minecraft:herringbone_dark_oak_parquet_from_dark_oak_planks_stonecutting" }, "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_herringbone_parquet", + "has_dark_oak_planks", "has_the_recipe" ] ], "rewards": { "recipes": [ - "new_soviet:herringbone_parquet_stairs" + "minecraft:herringbone_dark_oak_parquet_from_dark_oak_planks_stonecutting" ] }, "sends_telemetry_event": false diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_parquet_from_spruce_planks_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_dark_oak_parquet_slab.json similarity index 64% rename from src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_parquet_from_spruce_planks_stonecutting.json rename to src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_dark_oak_parquet_slab.json index 80d9daf..96735e3 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_parquet_from_spruce_planks_stonecutting.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_dark_oak_parquet_slab.json @@ -1,12 +1,12 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_spruce_planks": { + "has_herringbone_dark_oak_parquet": { "conditions": { "items": [ { "items": [ - "minecraft:spruce_planks" + "new_soviet:herringbone_dark_oak_parquet" ] } ] @@ -15,20 +15,20 @@ }, "has_the_recipe": { "conditions": { - "recipe": "minecraft:herringbone_parquet_from_spruce_planks_stonecutting" + "recipe": "new_soviet:herringbone_dark_oak_parquet_slab" }, "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_spruce_planks", + "has_herringbone_dark_oak_parquet", "has_the_recipe" ] ], "rewards": { "recipes": [ - "minecraft:herringbone_parquet_from_spruce_planks_stonecutting" + "new_soviet:herringbone_dark_oak_parquet_slab" ] }, "sends_telemetry_event": false diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_parquet_slab_from_herringbone_parquet_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_dark_oak_parquet_slab_from_herringbone_dark_oak_parquet_stonecutting.json similarity index 57% rename from src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_parquet_slab_from_herringbone_parquet_stonecutting.json rename to src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_dark_oak_parquet_slab_from_herringbone_dark_oak_parquet_stonecutting.json index 6b0055d..8cdd6b5 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_parquet_slab_from_herringbone_parquet_stonecutting.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_dark_oak_parquet_slab_from_herringbone_dark_oak_parquet_stonecutting.json @@ -1,12 +1,12 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_herringbone_parquet": { + "has_herringbone_dark_oak_parquet": { "conditions": { "items": [ { "items": [ - "new_soviet:herringbone_parquet" + "new_soviet:herringbone_dark_oak_parquet" ] } ] @@ -15,20 +15,20 @@ }, "has_the_recipe": { "conditions": { - "recipe": "minecraft:herringbone_parquet_slab_from_herringbone_parquet_stonecutting" + "recipe": "minecraft:herringbone_dark_oak_parquet_slab_from_herringbone_dark_oak_parquet_stonecutting" }, "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_herringbone_parquet", + "has_herringbone_dark_oak_parquet", "has_the_recipe" ] ], "rewards": { "recipes": [ - "minecraft:herringbone_parquet_slab_from_herringbone_parquet_stonecutting" + "minecraft:herringbone_dark_oak_parquet_slab_from_herringbone_dark_oak_parquet_stonecutting" ] }, "sends_telemetry_event": false diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_parquet_slab.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_dark_oak_parquet_stairs.json similarity index 64% rename from src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_parquet_slab.json rename to src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_dark_oak_parquet_stairs.json index b7e2fd8..6de40a6 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_parquet_slab.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_dark_oak_parquet_stairs.json @@ -1,12 +1,12 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_herringbone_parquet": { + "has_herringbone_dark_oak_parquet": { "conditions": { "items": [ { "items": [ - "new_soviet:herringbone_parquet" + "new_soviet:herringbone_dark_oak_parquet" ] } ] @@ -15,20 +15,20 @@ }, "has_the_recipe": { "conditions": { - "recipe": "new_soviet:herringbone_parquet_slab" + "recipe": "new_soviet:herringbone_dark_oak_parquet_stairs" }, "trigger": "minecraft:recipe_unlocked" } }, "requirements": [ [ - "has_herringbone_parquet", + "has_herringbone_dark_oak_parquet", "has_the_recipe" ] ], "rewards": { "recipes": [ - "new_soviet:herringbone_parquet_slab" + "new_soviet:herringbone_dark_oak_parquet_stairs" ] }, "sends_telemetry_event": false diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_dark_oak_parquet_stairs_from_herringbone_dark_oak_parquet_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_dark_oak_parquet_stairs_from_herringbone_dark_oak_parquet_stonecutting.json new file mode 100644 index 0000000..842c71f --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_dark_oak_parquet_stairs_from_herringbone_dark_oak_parquet_stonecutting.json @@ -0,0 +1,35 @@ +{ + "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 +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_parquet_stairs_from_herringbone_parquet_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_parquet_stairs_from_herringbone_parquet_stonecutting.json deleted file mode 100644 index 988bed3..0000000 --- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_parquet_stairs_from_herringbone_parquet_stonecutting.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "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 -} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_parquet_stairs.json b/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_dark_oak_parquet.json similarity index 83% rename from src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_parquet_stairs.json rename to src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_dark_oak_parquet.json index 254280c..a23d374 100644 --- a/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_parquet_stairs.json +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_dark_oak_parquet.json @@ -11,7 +11,7 @@ "entries": [ { "type": "minecraft:item", - "name": "new_soviet:herringbone_parquet_stairs" + "name": "new_soviet:herringbone_dark_oak_parquet" } ], "rolls": 1.0 diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_parquet_slab.json b/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_dark_oak_parquet_slab.json similarity index 81% rename from src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_parquet_slab.json rename to src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_dark_oak_parquet_slab.json index 0a9e7c0..593526b 100644 --- a/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_parquet_slab.json +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_dark_oak_parquet_slab.json @@ -11,7 +11,7 @@ "entries": [ { "type": "minecraft:item", - "name": "new_soviet:herringbone_parquet_slab" + "name": "new_soviet:herringbone_dark_oak_parquet_slab" } ], "rolls": 1.0 diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_parquet.json b/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_dark_oak_parquet_stairs.json similarity index 81% rename from src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_parquet.json rename to src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_dark_oak_parquet_stairs.json index e7b9873..1cf736e 100644 --- a/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_parquet.json +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_dark_oak_parquet_stairs.json @@ -11,7 +11,7 @@ "entries": [ { "type": "minecraft:item", - "name": "new_soviet:herringbone_parquet" + "name": "new_soviet:herringbone_dark_oak_parquet_stairs" } ], "rolls": 1.0 diff --git a/src/main/generated/data/new_soviet/recipes/herringbone_dark_oak_parquet_from_dark_oak_planks_stonecutting.json b/src/main/generated/data/new_soviet/recipes/herringbone_dark_oak_parquet_from_dark_oak_planks_stonecutting.json new file mode 100644 index 0000000..85dd24e --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/herringbone_dark_oak_parquet_from_dark_oak_planks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "minecraft:dark_oak_planks" + }, + "result": "new_soviet:herringbone_dark_oak_parquet" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/herringbone_parquet_slab.json b/src/main/generated/data/new_soviet/recipes/herringbone_dark_oak_parquet_slab.json similarity index 62% rename from src/main/generated/data/new_soviet/recipes/herringbone_parquet_slab.json rename to src/main/generated/data/new_soviet/recipes/herringbone_dark_oak_parquet_slab.json index 8b98759..72495fa 100644 --- a/src/main/generated/data/new_soviet/recipes/herringbone_parquet_slab.json +++ b/src/main/generated/data/new_soviet/recipes/herringbone_dark_oak_parquet_slab.json @@ -3,7 +3,7 @@ "category": "building", "key": { "#": { - "item": "new_soviet:herringbone_parquet" + "item": "new_soviet:herringbone_dark_oak_parquet" } }, "pattern": [ @@ -11,7 +11,7 @@ ], "result": { "count": 6, - "item": "new_soviet:herringbone_parquet_slab" + "item": "new_soviet:herringbone_dark_oak_parquet_slab" }, "show_notification": true } \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/herringbone_dark_oak_parquet_slab_from_herringbone_dark_oak_parquet_stonecutting.json b/src/main/generated/data/new_soviet/recipes/herringbone_dark_oak_parquet_slab_from_herringbone_dark_oak_parquet_stonecutting.json new file mode 100644 index 0000000..ebeb33e --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/herringbone_dark_oak_parquet_slab_from_herringbone_dark_oak_parquet_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:herringbone_dark_oak_parquet" + }, + "result": "new_soviet:herringbone_dark_oak_parquet_slab" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/herringbone_parquet_stairs.json b/src/main/generated/data/new_soviet/recipes/herringbone_dark_oak_parquet_stairs.json similarity index 64% rename from src/main/generated/data/new_soviet/recipes/herringbone_parquet_stairs.json rename to src/main/generated/data/new_soviet/recipes/herringbone_dark_oak_parquet_stairs.json index ef64912..e65c5cc 100644 --- a/src/main/generated/data/new_soviet/recipes/herringbone_parquet_stairs.json +++ b/src/main/generated/data/new_soviet/recipes/herringbone_dark_oak_parquet_stairs.json @@ -3,7 +3,7 @@ "category": "building", "key": { "#": { - "item": "new_soviet:herringbone_parquet" + "item": "new_soviet:herringbone_dark_oak_parquet" } }, "pattern": [ @@ -13,7 +13,7 @@ ], "result": { "count": 4, - "item": "new_soviet:herringbone_parquet_stairs" + "item": "new_soviet:herringbone_dark_oak_parquet_stairs" }, "show_notification": true } \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/herringbone_dark_oak_parquet_stairs_from_herringbone_dark_oak_parquet_stonecutting.json b/src/main/generated/data/new_soviet/recipes/herringbone_dark_oak_parquet_stairs_from_herringbone_dark_oak_parquet_stonecutting.json new file mode 100644 index 0000000..b6676c6 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/herringbone_dark_oak_parquet_stairs_from_herringbone_dark_oak_parquet_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:herringbone_dark_oak_parquet" + }, + "result": "new_soviet:herringbone_dark_oak_parquet_stairs" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/herringbone_parquet_from_spruce_planks_stonecutting.json b/src/main/generated/data/new_soviet/recipes/herringbone_parquet_from_spruce_planks_stonecutting.json deleted file mode 100644 index bc5b0d7..0000000 --- a/src/main/generated/data/new_soviet/recipes/herringbone_parquet_from_spruce_planks_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 1, - "ingredient": { - "item": "minecraft:spruce_planks" - }, - "result": "new_soviet:herringbone_parquet" -} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/herringbone_parquet_slab_from_herringbone_parquet_stonecutting.json b/src/main/generated/data/new_soviet/recipes/herringbone_parquet_slab_from_herringbone_parquet_stonecutting.json deleted file mode 100644 index 6a8131b..0000000 --- a/src/main/generated/data/new_soviet/recipes/herringbone_parquet_slab_from_herringbone_parquet_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 1, - "ingredient": { - "item": "new_soviet:herringbone_parquet" - }, - "result": "new_soviet:herringbone_parquet_slab" -} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/herringbone_parquet_stairs_from_herringbone_parquet_stonecutting.json b/src/main/generated/data/new_soviet/recipes/herringbone_parquet_stairs_from_herringbone_parquet_stonecutting.json deleted file mode 100644 index 397c994..0000000 --- a/src/main/generated/data/new_soviet/recipes/herringbone_parquet_stairs_from_herringbone_parquet_stonecutting.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "minecraft:stonecutting", - "count": 1, - "ingredient": { - "item": "new_soviet:herringbone_parquet" - }, - "result": "new_soviet:herringbone_parquet_stairs" -} \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/blocks/ConcreteWithBarsBlock.java b/src/main/java/su/a71/new_soviet/blocks/ConcreteWithBarsBlock.java index 6c1ced7..a906a1d 100644 --- a/src/main/java/su/a71/new_soviet/blocks/ConcreteWithBarsBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/ConcreteWithBarsBlock.java @@ -1,13 +1,14 @@ 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.DirectionProperty; +import net.minecraft.state.property.EnumProperty; import net.minecraft.state.property.Properties; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; @@ -15,38 +16,53 @@ 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; -public class ConcreteWithBarsBlock extends HorizontalFacingBlock implements Waterloggable { - public static final DirectionProperty VERTICAL_DIRECTION; +import java.util.List; + +public class ConcreteWithBarsBlock extends WallMountedBlock implements Waterloggable { public static final BooleanProperty WATERLOGGED; - public static final VoxelShape SHAPE_UP; - public static final VoxelShape SHAPE_DOWN; + 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 FACE; public ConcreteWithBarsBlock(Settings settings) { super(settings); setDefaultState(getDefaultState() .with(Properties.HORIZONTAL_FACING, Direction.NORTH) - .with(VERTICAL_DIRECTION, Direction.UP) + .with(FACE, WallMountLocation.FLOOR) .with(WATERLOGGED, false)); } @Override protected void appendProperties(StateManager.Builder builder) { - builder.add(Properties.HORIZONTAL_FACING, VERTICAL_DIRECTION, WATERLOGGED); + builder.add(Properties.HORIZONTAL_FACING, FACE, WATERLOGGED); } - @Override + @Nullable public BlockState getPlacementState(ItemPlacementContext ctx) { FluidState fluidState = ctx.getWorld().getFluidState(ctx.getBlockPos()); - return super.getPlacementState(ctx) - .with(Properties.HORIZONTAL_FACING, ctx.getHorizontalPlayerFacing().getOpposite()) - .with(VERTICAL_DIRECTION, ctx.getVerticalPlayerLookDirection().getOpposite()) - .with(WATERLOGGED, fluidState.getFluid() == Fluids.WATER); + 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; } public void onLandedUpon(World world, BlockState state, BlockPos pos, Entity entity, float fallDistance) { - if (state.get(VERTICAL_DIRECTION) == Direction.UP) { + if (state.get(FACE) == WallMountLocation.CEILING) { entity.handleFallDamage(fallDistance + 2.0F, 2.0F, world.getDamageSources().stalagmite()); } else { super.onLandedUpon(world, state, pos, entity, fallDistance); @@ -54,10 +70,16 @@ public class ConcreteWithBarsBlock extends HorizontalFacingBlock implements Wate } public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { - if (state.get(VERTICAL_DIRECTION) == Direction.DOWN) { - return SHAPE_UP; - } - return SHAPE_DOWN; + 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(); + }; } @Override @@ -73,9 +95,10 @@ public class ConcreteWithBarsBlock extends HorizontalFacingBlock implements Wate } static { - VERTICAL_DIRECTION = Properties.VERTICAL_DIRECTION; + FACE = Properties.WALL_MOUNT_LOCATION; WATERLOGGED = Properties.WATERLOGGED; - SHAPE_DOWN = Block.createCuboidShape(0, 0, 0, 16, 8, 16); - SHAPE_UP = Block.createCuboidShape(0, 8, 0, 16, 16, 16); + 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))); } } diff --git a/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java b/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java index 41f8ba2..e457684 100644 --- a/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java +++ b/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java @@ -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_PARQUET); + addDrop(NSE_Blocks.HERRINGBONE_DARK_OAK_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_PARQUET_SLAB); - addDrop(NSE_Blocks.HERRINGBONE_PARQUET_STAIRS); + addDrop(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_SLAB); + addDrop(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_STAIRS); addDrop(NSE_Blocks.STRAIGHT_PARQUET_SLAB); addDrop(NSE_Blocks.STRAIGHT_PARQUET_STAIRS); addDrop(NSE_Blocks.SEPARATED_PARQUET_SLAB); diff --git a/src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java b/src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java index d1b7b86..dec95d0 100644 --- a/src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java +++ b/src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java @@ -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_PARQUET) + .add(NSE_Blocks.HERRINGBONE_DARK_OAK_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_PARQUET_STAIRS) - .add(NSE_Blocks.HERRINGBONE_PARQUET_SLAB) + .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_STAIRS) + .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_SLAB) .add(NSE_Blocks.STRAIGHT_PARQUET_STAIRS) .add(NSE_Blocks.STRAIGHT_PARQUET_SLAB) .add(NSE_Blocks.SEPARATED_PARQUET_STAIRS) @@ -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_PARQUET_STAIRS) + .add(NSE_Blocks.HERRINGBONE_DARK_OAK_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_PARQUET_SLAB) + .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_SLAB) .add(NSE_Blocks.STRAIGHT_PARQUET_SLAB) .add(NSE_Blocks.SEPARATED_PARQUET_SLAB) .add(NSE_Blocks.GREEN_LINOLEUM_SLAB) diff --git a/src/main/java/su/a71/new_soviet/datagen/ModelGenerator.java b/src/main/java/su/a71/new_soviet/datagen/ModelGenerator.java index c7f3396..498725c 100644 --- a/src/main/java/su/a71/new_soviet/datagen/ModelGenerator.java +++ b/src/main/java/su/a71/new_soviet/datagen/ModelGenerator.java @@ -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_PARQUET, NSE_Blocks.HERRINGBONE_PARQUET_STAIRS, NSE_Blocks.HERRINGBONE_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.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"); diff --git a/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java b/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java index 68a9542..8da1962 100644 --- a/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java +++ b/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java @@ -427,6 +427,7 @@ 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); @@ -439,7 +440,6 @@ 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_PARQUET_STAIRS, NSE_Blocks.HERRINGBONE_PARQUET_SLAB, NSE_Blocks.HERRINGBONE_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.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); diff --git a/src/main/java/su/a71/new_soviet/registration/NSE_Blocks.java b/src/main/java/su/a71/new_soviet/registration/NSE_Blocks.java index 02c6994..6e5405e 100644 --- a/src/main/java/su/a71/new_soviet/registration/NSE_Blocks.java +++ b/src/main/java/su/a71/new_soviet/registration/NSE_Blocks.java @@ -264,6 +264,15 @@ 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)); @@ -401,13 +410,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_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 Block HERRINGBONE_DARK_OAK_PARQUET = new Block(FabricBlockSettings.create().sounds(NSE_Sounds.PARQUET_SOUNDS).strength(2f, 3f).mapColor(MapColor.OAK_TAN)); + public static final StairsBlock HERRINGBONE_DARK_OAK_PARQUET_STAIRS = new StairsBlock(HERRINGBONE_DARK_OAK_PARQUET.getDefaultState(), FabricBlockSettings.copy(HERRINGBONE_DARK_OAK_PARQUET)); + public static final SlabBlock HERRINGBONE_DARK_OAK_PARQUET_SLAB = new SlabBlock(FabricBlockSettings.copy(HERRINGBONE_DARK_OAK_PARQUET)); + public static final Block STRAIGHT_PARQUET = new Block(FabricBlockSettings.copy(HERRINGBONE_DARK_OAK_PARQUET)); public static final StairsBlock STRAIGHT_PARQUET_STAIRS = new StairsBlock(STRAIGHT_PARQUET.getDefaultState(), FabricBlockSettings.copy(STRAIGHT_PARQUET)); public static final SlabBlock STRAIGHT_PARQUET_SLAB = new SlabBlock(FabricBlockSettings.copy(STRAIGHT_PARQUET)); - public static final Block SEPARATED_PARQUET = new Block(FabricBlockSettings.copy(HERRINGBONE_PARQUET)); + public static final Block SEPARATED_PARQUET = new Block(FabricBlockSettings.copy(HERRINGBONE_DARK_OAK_PARQUET)); public static final StairsBlock SEPARATED_PARQUET_STAIRS = new StairsBlock(SEPARATED_PARQUET.getDefaultState(), FabricBlockSettings.copy(SEPARATED_PARQUET)); public static final SlabBlock SEPARATED_PARQUET_SLAB = new SlabBlock(FabricBlockSettings.copy(SEPARATED_PARQUET)); @@ -752,6 +761,15 @@ 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); @@ -891,9 +909,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_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("herringbone_dark_oak_parquet", () -> HERRINGBONE_DARK_OAK_PARQUET, NSE_BUILDING_TAB); + registerBlock("herringbone_dark_oak_parquet_stairs", () -> HERRINGBONE_DARK_OAK_PARQUET_STAIRS, NSE_BUILDING_TAB); + registerBlock("herringbone_dark_oak_parquet_slab", () -> HERRINGBONE_DARK_OAK_PARQUET_SLAB, NSE_BUILDING_TAB); registerBlock("straight_parquet", () -> STRAIGHT_PARQUET, NSE_BUILDING_TAB); registerBlock("straight_parquet_stairs", () -> STRAIGHT_PARQUET_STAIRS, NSE_BUILDING_TAB); registerBlock("straight_parquet_slab", () -> STRAIGHT_PARQUET_SLAB, NSE_BUILDING_TAB); @@ -1008,7 +1026,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_PARQUET, 20, 5); + flammableBlockRegistry.add(HERRINGBONE_DARK_OAK_PARQUET, 20, 5); flammableBlockRegistry.add(STRAIGHT_PARQUET, 20, 5); flammableBlockRegistry.add(SEPARATED_PARQUET, 20, 5); @@ -1057,8 +1075,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_PARQUET_STAIRS, 20, 5); - flammableBlockRegistry.add(HERRINGBONE_PARQUET_SLAB, 20, 5); + flammableBlockRegistry.add(HERRINGBONE_DARK_OAK_PARQUET_STAIRS, 20, 5); + flammableBlockRegistry.add(HERRINGBONE_DARK_OAK_PARQUET_SLAB, 20, 5); flammableBlockRegistry.add(STRAIGHT_PARQUET_STAIRS, 20, 5); flammableBlockRegistry.add(STRAIGHT_PARQUET_SLAB, 20, 5); flammableBlockRegistry.add(SEPARATED_PARQUET_STAIRS, 20, 5); diff --git a/src/main/resources/assets/new_soviet/blockstates/ap_landmine.json b/src/main/resources/assets/new_soviet/blockstates/ap_landmine.json index 44fc0d4..9e7278c 100644 --- a/src/main/resources/assets/new_soviet/blockstates/ap_landmine.json +++ b/src/main/resources/assets/new_soviet/blockstates/ap_landmine.json @@ -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 } } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/beige_concrete_with_bars.json b/src/main/resources/assets/new_soviet/blockstates/beige_concrete_with_bars.json index 654223c..6d321f4 100644 --- a/src/main/resources/assets/new_soviet/blockstates/beige_concrete_with_bars.json +++ b/src/main/resources/assets/new_soviet/blockstates/beige_concrete_with_bars.json @@ -1,12 +1,60 @@ { "variants": { - "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 } + "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 + } } } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/blue_concrete_with_bars.json b/src/main/resources/assets/new_soviet/blockstates/blue_concrete_with_bars.json index f9dee95..b799774 100644 --- a/src/main/resources/assets/new_soviet/blockstates/blue_concrete_with_bars.json +++ b/src/main/resources/assets/new_soviet/blockstates/blue_concrete_with_bars.json @@ -1,12 +1,60 @@ { "variants": { - "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 } + "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 + } } -} +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/concrete_with_bars.json b/src/main/resources/assets/new_soviet/blockstates/concrete_with_bars.json index bd10b0c..ac228c4 100644 --- a/src/main/resources/assets/new_soviet/blockstates/concrete_with_bars.json +++ b/src/main/resources/assets/new_soviet/blockstates/concrete_with_bars.json @@ -1,12 +1,60 @@ { "variants": { - "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 } + "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 + } } } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/dark_green_concrete_with_bars.json b/src/main/resources/assets/new_soviet/blockstates/dark_green_concrete_with_bars.json index c59b5bf..683e80d 100644 --- a/src/main/resources/assets/new_soviet/blockstates/dark_green_concrete_with_bars.json +++ b/src/main/resources/assets/new_soviet/blockstates/dark_green_concrete_with_bars.json @@ -1,12 +1,60 @@ { "variants": { - "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 } + "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 + } } } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/green_concrete_with_bars.json b/src/main/resources/assets/new_soviet/blockstates/green_concrete_with_bars.json index b18e341..f014d55 100644 --- a/src/main/resources/assets/new_soviet/blockstates/green_concrete_with_bars.json +++ b/src/main/resources/assets/new_soviet/blockstates/green_concrete_with_bars.json @@ -1,12 +1,60 @@ { "variants": { - "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 } + "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 + } } } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/orange_concrete_with_bars.json b/src/main/resources/assets/new_soviet/blockstates/orange_concrete_with_bars.json index 3517a58..b7a7e5a 100644 --- a/src/main/resources/assets/new_soviet/blockstates/orange_concrete_with_bars.json +++ b/src/main/resources/assets/new_soviet/blockstates/orange_concrete_with_bars.json @@ -1,12 +1,60 @@ { "variants": { - "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 } + "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 + } } } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/red_concrete_with_bars.json b/src/main/resources/assets/new_soviet/blockstates/red_concrete_with_bars.json index 6d5ffab..309b487 100644 --- a/src/main/resources/assets/new_soviet/blockstates/red_concrete_with_bars.json +++ b/src/main/resources/assets/new_soviet/blockstates/red_concrete_with_bars.json @@ -1,12 +1,60 @@ { "variants": { - "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 } + "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 + } } } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/white_concrete_with_bars.json b/src/main/resources/assets/new_soviet/blockstates/white_concrete_with_bars.json index 5cab519..c7f819c 100644 --- a/src/main/resources/assets/new_soviet/blockstates/white_concrete_with_bars.json +++ b/src/main/resources/assets/new_soviet/blockstates/white_concrete_with_bars.json @@ -1,12 +1,60 @@ { "variants": { - "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 } + "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 + } } } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/yellow_concrete_with_bars.json b/src/main/resources/assets/new_soviet/blockstates/yellow_concrete_with_bars.json index 278c2e8..71bc368 100644 --- a/src/main/resources/assets/new_soviet/blockstates/yellow_concrete_with_bars.json +++ b/src/main/resources/assets/new_soviet/blockstates/yellow_concrete_with_bars.json @@ -1,12 +1,60 @@ { "variants": { - "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 } + "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 + } } } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/lang/rpr.json b/src/main/resources/assets/new_soviet/lang/rpr.json index 5904445..f98a4cd 100644 --- a/src/main/resources/assets/new_soviet/lang/rpr.json +++ b/src/main/resources/assets/new_soviet/lang/rpr.json @@ -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_parquet": "Паркѣтъ «ёлочкой»", + "block.new_soviet.herringbone_dark_oak_parquet": "Паркѣтъ из тѣмнаго дуба «ёлочкой»", "block.new_soviet.straight_parquet": "Прямой паркѣт", "block.new_soviet.separated_parquet": "Раздѣлённый паркѣт", "block.new_soviet.green_linoleum": "Зѣлёный линолѣум", @@ -148,6 +148,7 @@ "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": "Потолочный вѣнтилятор", @@ -424,8 +425,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_parquet_slab": "Плита из паркѣта «ёлочкой»", - "block.new_soviet.herringbone_parquet_stairs": "Ступѣнi из паркѣта «ёлочкой»", + "block.new_soviet.herringbone_dark_oak_parquet_slab": "Плита из паркѣта тѣмнаго дуба «ёлочкой»", + "block.new_soviet.herringbone_dark_oak_parquet_stairs": "Ступѣнi из паркѣта тѣмнаго дуба «ёлочкой»", "block.new_soviet.straight_parquet_slab": "Плита из прямаго паркѣта", "block.new_soviet.straight_parquet_stairs": "Ступѣнi из прямаго паркѣта", "block.new_soviet.separated_parquet_slab": "Плита из раздѣлённаго паркѣта", diff --git a/src/main/resources/assets/new_soviet/lang/ru_ru.json b/src/main/resources/assets/new_soviet/lang/ru_ru.json index fd554dc..c7505d3 100644 --- a/src/main/resources/assets/new_soviet/lang/ru_ru.json +++ b/src/main/resources/assets/new_soviet/lang/ru_ru.json @@ -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_parquet": "Паркет «ёлочкой»", + "block.new_soviet.herringbone_dark_oak_parquet": "Паркет из тёмного дуба «ёлочкой»", "block.new_soviet.straight_parquet": "Прямой паркет", "block.new_soviet.separated_parquet": "Разделённый паркет", "block.new_soviet.green_linoleum": "Зелёный линолеум", @@ -148,6 +148,7 @@ "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": "Потолочный вентилятор", @@ -445,8 +446,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_parquet_slab": "Плита из паркета «ёлочкой»", - "block.new_soviet.herringbone_parquet_stairs": "Ступени из паркета «ёлочкой»", + "block.new_soviet.herringbone_dark_oak_parquet_slab": "Плита из тёмно дубового паркета «ёлочкой»", + "block.new_soviet.herringbone_dark_oak_parquet_stairs": "Ступени из тёмно дубового паркета «ёлочкой»", "block.new_soviet.straight_parquet_slab": "Плита из прямого паркета", "block.new_soviet.straight_parquet_stairs": "Ступени из прямого паркета", "block.new_soviet.separated_parquet_slab": "Плита из разделённого паркета", diff --git a/src/main/resources/assets/new_soviet/textures/block/floor/planks/herringbone_parquet.png b/src/main/resources/assets/new_soviet/textures/block/floor/planks/herringbone_dark_oak_parquet.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/floor/planks/herringbone_parquet.png rename to src/main/resources/assets/new_soviet/textures/block/floor/planks/herringbone_dark_oak_parquet.png diff --git a/src/main/resources/assets/new_soviet/textures/block/floor/planks/separated_parquet.png b/src/main/resources/assets/new_soviet/textures/block/floor/planks/separated_oak_parquet.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/floor/planks/separated_parquet.png rename to src/main/resources/assets/new_soviet/textures/block/floor/planks/separated_oak_parquet.png diff --git a/src/main/resources/assets/new_soviet/textures/block/floor/planks/spruce_herringbone_parquet.png b/src/main/resources/assets/new_soviet/textures/block/floor/planks/spruce_herringbone_parquet.png new file mode 100644 index 0000000..a4f0395 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/floor/planks/spruce_herringbone_parquet.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/floor/planks/straight_parquet.png b/src/main/resources/assets/new_soviet/textures/block/floor/planks/straight_oak_parquet.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/floor/planks/straight_parquet.png rename to src/main/resources/assets/new_soviet/textures/block/floor/planks/straight_oak_parquet.png