diff --git a/CHANGELOG b/CHANGELOG index d2bbc10..a5b679c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -31,7 +31,7 @@ This version focuses on QOL and bug fixes * Added Russian (ru_ru) and pre-reform Russian (ru_rpr) translations -* Added missing cherry and bamboo planks +* Added missing warped, cherry and bamboo planks * Added button to open config file when using Mod Menu * Added several new achievements and challenges (currently BROKEN FIX!!!) * Minor bug fixes diff --git a/TODO.md b/TODO.md index a138479..5758b4b 100644 --- a/TODO.md +++ b/TODO.md @@ -21,8 +21,8 @@ What the- - ??? meat ??? rake ## 0.3 Goal - QOL -* Russian translation -X * Cherry & bamboo planks (parquet) +X * Russian translation +X * Cherry & bamboo planks (parquet) ++ warped * More achievements * All missing recipes * Better feedback - particles, noises @@ -31,7 +31,8 @@ X * Cherry & bamboo planks (parquet) X * Add backside of TV hit-box * Missing warning stripes * Rework cigarette (code and some functionality) -* More land mines, land mine base item, create integration for it +* More landmines, land mine base item, create integration for it * Code maintenance X * Mod menu integration - setting screen, Russian description -* Overall better config management (/reload?) \ No newline at end of file +* Overall better config management (/reload?) +* Update the new russian translation!!! \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/blockstates/cross_warped_planks.json b/src/main/generated/assets/new_soviet/blockstates/cross_warped_planks.json new file mode 100644 index 0000000..5bda98b --- /dev/null +++ b/src/main/generated/assets/new_soviet/blockstates/cross_warped_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/cross_warped_planks" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/blockstates/cross_warped_planks_slab.json b/src/main/generated/assets/new_soviet/blockstates/cross_warped_planks_slab.json new file mode 100644 index 0000000..5533267 --- /dev/null +++ b/src/main/generated/assets/new_soviet/blockstates/cross_warped_planks_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "new_soviet:block/cross_warped_planks_slab" + }, + "type=double": { + "model": "new_soviet:block/cross_warped_planks" + }, + "type=top": { + "model": "new_soviet:block/cross_warped_planks_slab_top" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/blockstates/cross_warped_planks_stairs.json b/src/main/generated/assets/new_soviet/blockstates/cross_warped_planks_stairs.json new file mode 100644 index 0000000..076920a --- /dev/null +++ b/src/main/generated/assets/new_soviet/blockstates/cross_warped_planks_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "new_soviet:block/cross_warped_planks_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "new_soviet:block/cross_warped_planks_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "new_soviet:block/cross_warped_planks_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "new_soviet:block/cross_warped_planks_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "new_soviet:block/cross_warped_planks_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "new_soviet:block/cross_warped_planks_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "new_soviet:block/cross_warped_planks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "new_soviet:block/cross_warped_planks_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "new_soviet:block/cross_warped_planks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "new_soviet:block/cross_warped_planks_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "new_soviet:block/cross_warped_planks_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "new_soviet:block/cross_warped_planks_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "new_soviet:block/cross_warped_planks_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "new_soviet:block/cross_warped_planks_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "new_soviet:block/cross_warped_planks_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "new_soviet:block/cross_warped_planks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "new_soviet:block/cross_warped_planks_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "new_soviet:block/cross_warped_planks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "new_soviet:block/cross_warped_planks_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "new_soviet:block/cross_warped_planks_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "new_soviet:block/cross_warped_planks_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "new_soviet:block/cross_warped_planks_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "new_soviet:block/cross_warped_planks_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "new_soviet:block/cross_warped_planks_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "new_soviet:block/cross_warped_planks_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "new_soviet:block/cross_warped_planks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "new_soviet:block/cross_warped_planks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "new_soviet:block/cross_warped_planks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "new_soviet:block/cross_warped_planks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "new_soviet:block/cross_warped_planks_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "new_soviet:block/cross_warped_planks_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "new_soviet:block/cross_warped_planks_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "new_soviet:block/cross_warped_planks_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "new_soviet:block/cross_warped_planks_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "new_soviet:block/cross_warped_planks_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "new_soviet:block/cross_warped_planks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "new_soviet:block/cross_warped_planks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "new_soviet:block/cross_warped_planks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "new_soviet:block/cross_warped_planks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "new_soviet:block/cross_warped_planks_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/blockstates/herringbone_warped_planks.json b/src/main/generated/assets/new_soviet/blockstates/herringbone_warped_planks.json new file mode 100644 index 0000000..b30cad6 --- /dev/null +++ b/src/main/generated/assets/new_soviet/blockstates/herringbone_warped_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/herringbone_warped_planks" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/blockstates/herringbone_warped_planks_slab.json b/src/main/generated/assets/new_soviet/blockstates/herringbone_warped_planks_slab.json new file mode 100644 index 0000000..e953841 --- /dev/null +++ b/src/main/generated/assets/new_soviet/blockstates/herringbone_warped_planks_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "new_soviet:block/herringbone_warped_planks_slab" + }, + "type=double": { + "model": "new_soviet:block/herringbone_warped_planks" + }, + "type=top": { + "model": "new_soviet:block/herringbone_warped_planks_slab_top" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/blockstates/herringbone_warped_planks_stairs.json b/src/main/generated/assets/new_soviet/blockstates/herringbone_warped_planks_stairs.json new file mode 100644 index 0000000..b33a721 --- /dev/null +++ b/src/main/generated/assets/new_soviet/blockstates/herringbone_warped_planks_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "new_soviet:block/herringbone_warped_planks_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "new_soviet:block/herringbone_warped_planks_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "new_soviet:block/herringbone_warped_planks_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "new_soviet:block/herringbone_warped_planks_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "new_soviet:block/herringbone_warped_planks_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "new_soviet:block/herringbone_warped_planks_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "new_soviet:block/herringbone_warped_planks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "new_soviet:block/herringbone_warped_planks_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "new_soviet:block/herringbone_warped_planks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "new_soviet:block/herringbone_warped_planks_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "new_soviet:block/herringbone_warped_planks_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "new_soviet:block/herringbone_warped_planks_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "new_soviet:block/herringbone_warped_planks_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "new_soviet:block/herringbone_warped_planks_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "new_soviet:block/herringbone_warped_planks_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "new_soviet:block/herringbone_warped_planks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "new_soviet:block/herringbone_warped_planks_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "new_soviet:block/herringbone_warped_planks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "new_soviet:block/herringbone_warped_planks_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "new_soviet:block/herringbone_warped_planks_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "new_soviet:block/herringbone_warped_planks_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "new_soviet:block/herringbone_warped_planks_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "new_soviet:block/herringbone_warped_planks_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "new_soviet:block/herringbone_warped_planks_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "new_soviet:block/herringbone_warped_planks_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "new_soviet:block/herringbone_warped_planks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "new_soviet:block/herringbone_warped_planks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "new_soviet:block/herringbone_warped_planks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "new_soviet:block/herringbone_warped_planks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "new_soviet:block/herringbone_warped_planks_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "new_soviet:block/herringbone_warped_planks_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "new_soviet:block/herringbone_warped_planks_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "new_soviet:block/herringbone_warped_planks_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "new_soviet:block/herringbone_warped_planks_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "new_soviet:block/herringbone_warped_planks_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "new_soviet:block/herringbone_warped_planks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "new_soviet:block/herringbone_warped_planks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "new_soviet:block/herringbone_warped_planks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "new_soviet:block/herringbone_warped_planks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "new_soviet:block/herringbone_warped_planks_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cross_warped_planks.json b/src/main/generated/assets/new_soviet/models/block/cross_warped_planks.json new file mode 100644 index 0000000..aba27f3 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/cross_warped_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "new_soviet:block/floor/planks/cross_warped_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cross_warped_planks_slab.json b/src/main/generated/assets/new_soviet/models/block/cross_warped_planks_slab.json new file mode 100644 index 0000000..9a6a75e --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/cross_warped_planks_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "new_soviet:block/floor/planks/cross_warped_planks", + "side": "new_soviet:block/floor/planks/cross_warped_planks", + "top": "new_soviet:block/floor/planks/cross_warped_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cross_warped_planks_slab_top.json b/src/main/generated/assets/new_soviet/models/block/cross_warped_planks_slab_top.json new file mode 100644 index 0000000..d8f97cd --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/cross_warped_planks_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "new_soviet:block/floor/planks/cross_warped_planks", + "side": "new_soviet:block/floor/planks/cross_warped_planks", + "top": "new_soviet:block/floor/planks/cross_warped_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cross_warped_planks_stairs.json b/src/main/generated/assets/new_soviet/models/block/cross_warped_planks_stairs.json new file mode 100644 index 0000000..b7ffad8 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/cross_warped_planks_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "new_soviet:block/floor/planks/cross_warped_planks", + "side": "new_soviet:block/floor/planks/cross_warped_planks", + "top": "new_soviet:block/floor/planks/cross_warped_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cross_warped_planks_stairs_inner.json b/src/main/generated/assets/new_soviet/models/block/cross_warped_planks_stairs_inner.json new file mode 100644 index 0000000..f54ddc6 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/cross_warped_planks_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "new_soviet:block/floor/planks/cross_warped_planks", + "side": "new_soviet:block/floor/planks/cross_warped_planks", + "top": "new_soviet:block/floor/planks/cross_warped_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cross_warped_planks_stairs_outer.json b/src/main/generated/assets/new_soviet/models/block/cross_warped_planks_stairs_outer.json new file mode 100644 index 0000000..e13a0b6 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/cross_warped_planks_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "new_soviet:block/floor/planks/cross_warped_planks", + "side": "new_soviet:block/floor/planks/cross_warped_planks", + "top": "new_soviet:block/floor/planks/cross_warped_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_warped_planks.json b/src/main/generated/assets/new_soviet/models/block/herringbone_warped_planks.json new file mode 100644 index 0000000..48b4b30 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/herringbone_warped_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "new_soviet:block/floor/planks/herringbone_warped_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_warped_planks_slab.json b/src/main/generated/assets/new_soviet/models/block/herringbone_warped_planks_slab.json new file mode 100644 index 0000000..80a58a6 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/herringbone_warped_planks_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "new_soviet:block/floor/planks/herringbone_warped_planks", + "side": "new_soviet:block/floor/planks/herringbone_warped_planks", + "top": "new_soviet:block/floor/planks/herringbone_warped_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_warped_planks_slab_top.json b/src/main/generated/assets/new_soviet/models/block/herringbone_warped_planks_slab_top.json new file mode 100644 index 0000000..daca1b9 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/herringbone_warped_planks_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "new_soviet:block/floor/planks/herringbone_warped_planks", + "side": "new_soviet:block/floor/planks/herringbone_warped_planks", + "top": "new_soviet:block/floor/planks/herringbone_warped_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_warped_planks_stairs.json b/src/main/generated/assets/new_soviet/models/block/herringbone_warped_planks_stairs.json new file mode 100644 index 0000000..2426eaa --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/herringbone_warped_planks_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "new_soviet:block/floor/planks/herringbone_warped_planks", + "side": "new_soviet:block/floor/planks/herringbone_warped_planks", + "top": "new_soviet:block/floor/planks/herringbone_warped_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_warped_planks_stairs_inner.json b/src/main/generated/assets/new_soviet/models/block/herringbone_warped_planks_stairs_inner.json new file mode 100644 index 0000000..f56f977 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/herringbone_warped_planks_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "new_soviet:block/floor/planks/herringbone_warped_planks", + "side": "new_soviet:block/floor/planks/herringbone_warped_planks", + "top": "new_soviet:block/floor/planks/herringbone_warped_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_warped_planks_stairs_outer.json b/src/main/generated/assets/new_soviet/models/block/herringbone_warped_planks_stairs_outer.json new file mode 100644 index 0000000..07c4829 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/herringbone_warped_planks_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "new_soviet:block/floor/planks/herringbone_warped_planks", + "side": "new_soviet:block/floor/planks/herringbone_warped_planks", + "top": "new_soviet:block/floor/planks/herringbone_warped_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/cross_warped_planks.json b/src/main/generated/assets/new_soviet/models/item/cross_warped_planks.json new file mode 100644 index 0000000..8e355bc --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/item/cross_warped_planks.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/cross_warped_planks" +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/cross_warped_planks_slab.json b/src/main/generated/assets/new_soviet/models/item/cross_warped_planks_slab.json new file mode 100644 index 0000000..8c620ab --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/item/cross_warped_planks_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/cross_warped_planks_slab" +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/cross_warped_planks_stairs.json b/src/main/generated/assets/new_soviet/models/item/cross_warped_planks_stairs.json new file mode 100644 index 0000000..23b212a --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/item/cross_warped_planks_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/cross_warped_planks_stairs" +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/herringbone_warped_planks.json b/src/main/generated/assets/new_soviet/models/item/herringbone_warped_planks.json new file mode 100644 index 0000000..1e1e1e6 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/item/herringbone_warped_planks.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/herringbone_warped_planks" +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/herringbone_warped_planks_slab.json b/src/main/generated/assets/new_soviet/models/item/herringbone_warped_planks_slab.json new file mode 100644 index 0000000..6a56f8b --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/item/herringbone_warped_planks_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/herringbone_warped_planks_slab" +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/herringbone_warped_planks_stairs.json b/src/main/generated/assets/new_soviet/models/item/herringbone_warped_planks_stairs.json new file mode 100644 index 0000000..18e8e13 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/item/herringbone_warped_planks_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/herringbone_warped_planks_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 ffdb8e0..78f5017 100644 --- a/src/main/generated/data/minecraft/tags/blocks/mineable/axe.json +++ b/src/main/generated/data/minecraft/tags/blocks/mineable/axe.json @@ -11,6 +11,8 @@ "new_soviet:cross_birch_planks", "new_soviet:herringbone_crimson_planks", "new_soviet:cross_crimson_planks", + "new_soviet:herringbone_warped_planks", + "new_soviet:cross_warped_planks", "new_soviet:herringbone_dark_oak_planks", "new_soviet:cross_dark_oak_planks", "new_soviet:herringbone_jungle_planks", @@ -54,6 +56,10 @@ "new_soviet:herringbone_crimson_planks_slab", "new_soviet:cross_crimson_planks_stairs", "new_soviet:cross_crimson_planks_slab", + "new_soviet:herringbone_warped_planks_stairs", + "new_soviet:herringbone_warped_planks_slab", + "new_soviet:cross_warped_planks_stairs", + "new_soviet:cross_warped_planks_slab", "new_soviet:herringbone_dark_oak_planks_stairs", "new_soviet:herringbone_dark_oak_planks_slab", "new_soviet:cross_dark_oak_planks_stairs", diff --git a/src/main/generated/data/minecraft/tags/blocks/slabs.json b/src/main/generated/data/minecraft/tags/blocks/slabs.json index 138d00b..8f5d5ec 100644 --- a/src/main/generated/data/minecraft/tags/blocks/slabs.json +++ b/src/main/generated/data/minecraft/tags/blocks/slabs.json @@ -84,6 +84,8 @@ "new_soviet:cross_birch_planks_slab", "new_soviet:herringbone_crimson_planks_slab", "new_soviet:cross_crimson_planks_slab", + "new_soviet:herringbone_warped_planks_slab", + "new_soviet:cross_warped_planks_slab", "new_soviet:herringbone_dark_oak_planks_slab", "new_soviet:cross_dark_oak_planks_slab", "new_soviet:herringbone_jungle_planks_slab", diff --git a/src/main/generated/data/minecraft/tags/blocks/stairs.json b/src/main/generated/data/minecraft/tags/blocks/stairs.json index ecf5e8e..432a96a 100644 --- a/src/main/generated/data/minecraft/tags/blocks/stairs.json +++ b/src/main/generated/data/minecraft/tags/blocks/stairs.json @@ -84,6 +84,8 @@ "new_soviet:cross_birch_planks_stairs", "new_soviet:herringbone_crimson_planks_stairs", "new_soviet:cross_crimson_planks_stairs", + "new_soviet:herringbone_warped_planks_stairs", + "new_soviet:cross_warped_planks_stairs", "new_soviet:herringbone_dark_oak_planks_stairs", "new_soviet:cross_dark_oak_planks_stairs", "new_soviet:herringbone_jungle_planks_stairs", diff --git a/src/main/generated/data/minecraft/tags/blocks/wooden_slabs.json b/src/main/generated/data/minecraft/tags/blocks/wooden_slabs.json index 232680a..603b6d4 100644 --- a/src/main/generated/data/minecraft/tags/blocks/wooden_slabs.json +++ b/src/main/generated/data/minecraft/tags/blocks/wooden_slabs.json @@ -9,6 +9,8 @@ "new_soviet:cross_birch_planks_slab", "new_soviet:herringbone_crimson_planks_slab", "new_soviet:cross_crimson_planks_slab", + "new_soviet:herringbone_warped_planks_slab", + "new_soviet:cross_warped_planks_slab", "new_soviet:herringbone_dark_oak_planks_slab", "new_soviet:cross_dark_oak_planks_slab", "new_soviet:herringbone_jungle_planks_slab", diff --git a/src/main/generated/data/minecraft/tags/blocks/wooden_stairs.json b/src/main/generated/data/minecraft/tags/blocks/wooden_stairs.json index 4ba84ae..c2931a0 100644 --- a/src/main/generated/data/minecraft/tags/blocks/wooden_stairs.json +++ b/src/main/generated/data/minecraft/tags/blocks/wooden_stairs.json @@ -9,6 +9,8 @@ "new_soviet:cross_birch_planks_stairs", "new_soviet:herringbone_crimson_planks_stairs", "new_soviet:cross_crimson_planks_stairs", + "new_soviet:herringbone_warped_planks_stairs", + "new_soviet:cross_warped_planks_stairs", "new_soviet:herringbone_dark_oak_planks_stairs", "new_soviet:cross_dark_oak_planks_stairs", "new_soviet:herringbone_jungle_planks_stairs", diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_warped_planks_from_herringbone_warped_planks_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_warped_planks_from_herringbone_warped_planks_stonecutting.json new file mode 100644 index 0000000..d6d5fca --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_warped_planks_from_herringbone_warped_planks_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_herringbone_warped_planks": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:herringbone_warped_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:cross_warped_planks_from_herringbone_warped_planks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_herringbone_warped_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:cross_warped_planks_from_herringbone_warped_planks_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_warped_planks_from_warped_planks_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_warped_planks_from_warped_planks_stonecutting.json new file mode 100644 index 0000000..cd0351f --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_warped_planks_from_warped_planks_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:cross_warped_planks_from_warped_planks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_warped_planks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:warped_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_warped_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:cross_warped_planks_from_warped_planks_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_warped_planks_slab.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_warped_planks_slab.json new file mode 100644 index 0000000..6f696a3 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_warped_planks_slab.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cross_warped_planks": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:cross_warped_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:cross_warped_planks_slab" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cross_warped_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:cross_warped_planks_slab" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_warped_planks_slab_from_cross_warped_planks_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_warped_planks_slab_from_cross_warped_planks_stonecutting.json new file mode 100644 index 0000000..161a487 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_warped_planks_slab_from_cross_warped_planks_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cross_warped_planks": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:cross_warped_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:cross_warped_planks_slab_from_cross_warped_planks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cross_warped_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:cross_warped_planks_slab_from_cross_warped_planks_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_warped_planks_stairs.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_warped_planks_stairs.json new file mode 100644 index 0000000..d5aff46 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_warped_planks_stairs.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cross_warped_planks": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:cross_warped_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:cross_warped_planks_stairs" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cross_warped_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:cross_warped_planks_stairs" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_warped_planks_stairs_from_cross_warped_planks_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_warped_planks_stairs_from_cross_warped_planks_stonecutting.json new file mode 100644 index 0000000..0e83b22 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_warped_planks_stairs_from_cross_warped_planks_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cross_warped_planks": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:cross_warped_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:cross_warped_planks_stairs_from_cross_warped_planks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cross_warped_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:cross_warped_planks_stairs_from_cross_warped_planks_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_warped_planks_from_cross_warped_planks_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_warped_planks_from_cross_warped_planks_stonecutting.json new file mode 100644 index 0000000..d23a638 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_warped_planks_from_cross_warped_planks_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cross_warped_planks": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:cross_warped_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:herringbone_warped_planks_from_cross_warped_planks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cross_warped_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:herringbone_warped_planks_from_cross_warped_planks_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_warped_planks_from_warped_planks_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_warped_planks_from_warped_planks_stonecutting.json new file mode 100644 index 0000000..732ac7a --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_warped_planks_from_warped_planks_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:herringbone_warped_planks_from_warped_planks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_warped_planks": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:warped_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_warped_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:herringbone_warped_planks_from_warped_planks_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_warped_planks_slab.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_warped_planks_slab.json new file mode 100644 index 0000000..68c8b3e --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_warped_planks_slab.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_herringbone_warped_planks": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:herringbone_warped_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:herringbone_warped_planks_slab" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_herringbone_warped_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:herringbone_warped_planks_slab" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_warped_planks_slab_from_herringbone_warped_planks_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_warped_planks_slab_from_herringbone_warped_planks_stonecutting.json new file mode 100644 index 0000000..61163d5 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_warped_planks_slab_from_herringbone_warped_planks_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_herringbone_warped_planks": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:herringbone_warped_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:herringbone_warped_planks_slab_from_herringbone_warped_planks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_herringbone_warped_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:herringbone_warped_planks_slab_from_herringbone_warped_planks_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_warped_planks_stairs.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_warped_planks_stairs.json new file mode 100644 index 0000000..5b556e8 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_warped_planks_stairs.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_herringbone_warped_planks": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:herringbone_warped_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:herringbone_warped_planks_stairs" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_herringbone_warped_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:herringbone_warped_planks_stairs" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_warped_planks_stairs_from_herringbone_warped_planks_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_warped_planks_stairs_from_herringbone_warped_planks_stonecutting.json new file mode 100644 index 0000000..972d26a --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_warped_planks_stairs_from_herringbone_warped_planks_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_herringbone_warped_planks": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:herringbone_warped_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:herringbone_warped_planks_stairs_from_herringbone_warped_planks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_herringbone_warped_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:herringbone_warped_planks_stairs_from_herringbone_warped_planks_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/warped_planks_from_cross_warped_planks_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/warped_planks_from_cross_warped_planks_stonecutting.json new file mode 100644 index 0000000..66d392e --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/warped_planks_from_cross_warped_planks_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cross_warped_planks": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:cross_warped_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:warped_planks_from_cross_warped_planks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cross_warped_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:warped_planks_from_cross_warped_planks_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/warped_planks_from_herringbone_warped_planks_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/warped_planks_from_herringbone_warped_planks_stonecutting.json new file mode 100644 index 0000000..52d89a8 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/warped_planks_from_herringbone_warped_planks_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_herringbone_warped_planks": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:herringbone_warped_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:warped_planks_from_herringbone_warped_planks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_herringbone_warped_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:warped_planks_from_herringbone_warped_planks_stonecutting" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/cross_warped_planks.json b/src/main/generated/data/new_soviet/loot_tables/blocks/cross_warped_planks.json new file mode 100644 index 0000000..7ec8505 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/cross_warped_planks.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:cross_warped_planks" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/cross_warped_planks_slab.json b/src/main/generated/data/new_soviet/loot_tables/blocks/cross_warped_planks_slab.json new file mode 100644 index 0000000..3225554 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/cross_warped_planks_slab.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:cross_warped_planks_slab" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/cross_warped_planks_stairs.json b/src/main/generated/data/new_soviet/loot_tables/blocks/cross_warped_planks_stairs.json new file mode 100644 index 0000000..ed4fa6d --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/cross_warped_planks_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:cross_warped_planks_stairs" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_warped_planks.json b/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_warped_planks.json new file mode 100644 index 0000000..71a9fd2 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_warped_planks.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:herringbone_warped_planks" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_warped_planks_slab.json b/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_warped_planks_slab.json new file mode 100644 index 0000000..76da6c5 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_warped_planks_slab.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:herringbone_warped_planks_slab" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_warped_planks_stairs.json b/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_warped_planks_stairs.json new file mode 100644 index 0000000..79bfc21 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_warped_planks_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:herringbone_warped_planks_stairs" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cross_warped_planks_from_herringbone_warped_planks_stonecutting.json b/src/main/generated/data/new_soviet/recipes/cross_warped_planks_from_herringbone_warped_planks_stonecutting.json new file mode 100644 index 0000000..8ff71f5 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cross_warped_planks_from_herringbone_warped_planks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:herringbone_warped_planks" + }, + "result": "new_soviet:cross_warped_planks" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cross_warped_planks_from_warped_planks_stonecutting.json b/src/main/generated/data/new_soviet/recipes/cross_warped_planks_from_warped_planks_stonecutting.json new file mode 100644 index 0000000..a3a3fed --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cross_warped_planks_from_warped_planks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "minecraft:warped_planks" + }, + "result": "new_soviet:cross_warped_planks" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cross_warped_planks_slab.json b/src/main/generated/data/new_soviet/recipes/cross_warped_planks_slab.json new file mode 100644 index 0000000..aa183f4 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cross_warped_planks_slab.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "new_soviet:cross_warped_planks" + } + }, + "pattern": [ + "###" + ], + "result": { + "count": 6, + "item": "new_soviet:cross_warped_planks_slab" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cross_warped_planks_slab_from_cross_warped_planks_stonecutting.json b/src/main/generated/data/new_soviet/recipes/cross_warped_planks_slab_from_cross_warped_planks_stonecutting.json new file mode 100644 index 0000000..30ba42b --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cross_warped_planks_slab_from_cross_warped_planks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:cross_warped_planks" + }, + "result": "new_soviet:cross_warped_planks_slab" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cross_warped_planks_stairs.json b/src/main/generated/data/new_soviet/recipes/cross_warped_planks_stairs.json new file mode 100644 index 0000000..5f7555a --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cross_warped_planks_stairs.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "new_soviet:cross_warped_planks" + } + }, + "pattern": [ + "# ", + "## ", + "###" + ], + "result": { + "count": 4, + "item": "new_soviet:cross_warped_planks_stairs" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cross_warped_planks_stairs_from_cross_warped_planks_stonecutting.json b/src/main/generated/data/new_soviet/recipes/cross_warped_planks_stairs_from_cross_warped_planks_stonecutting.json new file mode 100644 index 0000000..a195293 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cross_warped_planks_stairs_from_cross_warped_planks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:cross_warped_planks" + }, + "result": "new_soviet:cross_warped_planks_stairs" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/herringbone_warped_planks_from_cross_warped_planks_stonecutting.json b/src/main/generated/data/new_soviet/recipes/herringbone_warped_planks_from_cross_warped_planks_stonecutting.json new file mode 100644 index 0000000..80021b5 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/herringbone_warped_planks_from_cross_warped_planks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:cross_warped_planks" + }, + "result": "new_soviet:herringbone_warped_planks" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/herringbone_warped_planks_from_warped_planks_stonecutting.json b/src/main/generated/data/new_soviet/recipes/herringbone_warped_planks_from_warped_planks_stonecutting.json new file mode 100644 index 0000000..ef68815 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/herringbone_warped_planks_from_warped_planks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "minecraft:warped_planks" + }, + "result": "new_soviet:herringbone_warped_planks" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/herringbone_warped_planks_slab.json b/src/main/generated/data/new_soviet/recipes/herringbone_warped_planks_slab.json new file mode 100644 index 0000000..ee8b5a2 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/herringbone_warped_planks_slab.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "new_soviet:herringbone_warped_planks" + } + }, + "pattern": [ + "###" + ], + "result": { + "count": 6, + "item": "new_soviet:herringbone_warped_planks_slab" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/herringbone_warped_planks_slab_from_herringbone_warped_planks_stonecutting.json b/src/main/generated/data/new_soviet/recipes/herringbone_warped_planks_slab_from_herringbone_warped_planks_stonecutting.json new file mode 100644 index 0000000..bc3af10 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/herringbone_warped_planks_slab_from_herringbone_warped_planks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:herringbone_warped_planks" + }, + "result": "new_soviet:herringbone_warped_planks_slab" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/herringbone_warped_planks_stairs.json b/src/main/generated/data/new_soviet/recipes/herringbone_warped_planks_stairs.json new file mode 100644 index 0000000..8cc8a2a --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/herringbone_warped_planks_stairs.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "new_soviet:herringbone_warped_planks" + } + }, + "pattern": [ + "# ", + "## ", + "###" + ], + "result": { + "count": 4, + "item": "new_soviet:herringbone_warped_planks_stairs" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/herringbone_warped_planks_stairs_from_herringbone_warped_planks_stonecutting.json b/src/main/generated/data/new_soviet/recipes/herringbone_warped_planks_stairs_from_herringbone_warped_planks_stonecutting.json new file mode 100644 index 0000000..0163450 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/herringbone_warped_planks_stairs_from_herringbone_warped_planks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:herringbone_warped_planks" + }, + "result": "new_soviet:herringbone_warped_planks_stairs" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/warped_planks_from_cross_warped_planks_stonecutting.json b/src/main/generated/data/new_soviet/recipes/warped_planks_from_cross_warped_planks_stonecutting.json new file mode 100644 index 0000000..cac534f --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/warped_planks_from_cross_warped_planks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:cross_warped_planks" + }, + "result": "minecraft:warped_planks" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/warped_planks_from_herringbone_warped_planks_stonecutting.json b/src/main/generated/data/new_soviet/recipes/warped_planks_from_herringbone_warped_planks_stonecutting.json new file mode 100644 index 0000000..44824bb --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/warped_planks_from_herringbone_warped_planks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:herringbone_warped_planks" + }, + "result": "minecraft:warped_planks" +} \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java b/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java index af10421..2ca0893 100644 --- a/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java +++ b/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java @@ -143,6 +143,8 @@ public class BlockLootTables extends FabricBlockLootTableProvider { addDrop(NSE_Blocks.CROSS_BIRCH_PLANKS); addDrop(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS); addDrop(NSE_Blocks.CROSS_CRIMSON_PLANKS); + addDrop(NSE_Blocks.HERRINGBONE_WARPED_PLANKS); + addDrop(NSE_Blocks.CROSS_WARPED_PLANKS); addDrop(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS); addDrop(NSE_Blocks.CROSS_DARK_OAK_PLANKS); addDrop(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS); @@ -406,6 +408,10 @@ public class BlockLootTables extends FabricBlockLootTableProvider { addDrop(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_STAIRS); addDrop(NSE_Blocks.CROSS_CRIMSON_PLANKS_SLAB); addDrop(NSE_Blocks.CROSS_CRIMSON_PLANKS_STAIRS); + addDrop(NSE_Blocks.HERRINGBONE_WARPED_PLANKS_SLAB); + addDrop(NSE_Blocks.HERRINGBONE_WARPED_PLANKS_STAIRS); + addDrop(NSE_Blocks.CROSS_WARPED_PLANKS_SLAB); + addDrop(NSE_Blocks.CROSS_WARPED_PLANKS_STAIRS); addDrop(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_SLAB); addDrop(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_STAIRS); addDrop(NSE_Blocks.CROSS_DARK_OAK_PLANKS_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 2768411..ac47945 100644 --- a/src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java +++ b/src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java @@ -322,6 +322,8 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider { .add(NSE_Blocks.CROSS_BIRCH_PLANKS) .add(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS) .add(NSE_Blocks.CROSS_CRIMSON_PLANKS) + .add(NSE_Blocks.HERRINGBONE_WARPED_PLANKS) + .add(NSE_Blocks.CROSS_WARPED_PLANKS) .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS) .add(NSE_Blocks.CROSS_DARK_OAK_PLANKS) .add(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS) @@ -365,6 +367,10 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider { .add(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_SLAB) .add(NSE_Blocks.CROSS_CRIMSON_PLANKS_STAIRS) .add(NSE_Blocks.CROSS_CRIMSON_PLANKS_SLAB) + .add(NSE_Blocks.HERRINGBONE_WARPED_PLANKS_STAIRS) + .add(NSE_Blocks.HERRINGBONE_WARPED_PLANKS_SLAB) + .add(NSE_Blocks.CROSS_WARPED_PLANKS_STAIRS) + .add(NSE_Blocks.CROSS_WARPED_PLANKS_SLAB) .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_STAIRS) .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_SLAB) .add(NSE_Blocks.CROSS_DARK_OAK_PLANKS_STAIRS) @@ -554,6 +560,8 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider { .add(NSE_Blocks.CROSS_BIRCH_PLANKS_STAIRS) .add(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_STAIRS) .add(NSE_Blocks.CROSS_CRIMSON_PLANKS_STAIRS) + .add(NSE_Blocks.HERRINGBONE_WARPED_PLANKS_STAIRS) + .add(NSE_Blocks.CROSS_WARPED_PLANKS_STAIRS) .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_STAIRS) .add(NSE_Blocks.CROSS_DARK_OAK_PLANKS_STAIRS) .add(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_STAIRS) @@ -661,6 +669,8 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider { .add(NSE_Blocks.CROSS_BIRCH_PLANKS_SLAB) .add(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_SLAB) .add(NSE_Blocks.CROSS_CRIMSON_PLANKS_SLAB) + .add(NSE_Blocks.HERRINGBONE_WARPED_PLANKS_SLAB) + .add(NSE_Blocks.CROSS_WARPED_PLANKS_SLAB) .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_SLAB) .add(NSE_Blocks.CROSS_DARK_OAK_PLANKS_SLAB) .add(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_SLAB) @@ -693,6 +703,8 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider { .add(NSE_Blocks.CROSS_BIRCH_PLANKS_STAIRS) .add(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_STAIRS) .add(NSE_Blocks.CROSS_CRIMSON_PLANKS_STAIRS) + .add(NSE_Blocks.HERRINGBONE_WARPED_PLANKS_STAIRS) + .add(NSE_Blocks.CROSS_WARPED_PLANKS_STAIRS) .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_STAIRS) .add(NSE_Blocks.CROSS_DARK_OAK_PLANKS_STAIRS) .add(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_STAIRS) @@ -714,6 +726,8 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider { .add(NSE_Blocks.CROSS_BIRCH_PLANKS_SLAB) .add(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_SLAB) .add(NSE_Blocks.CROSS_CRIMSON_PLANKS_SLAB) + .add(NSE_Blocks.HERRINGBONE_WARPED_PLANKS_SLAB) + .add(NSE_Blocks.CROSS_WARPED_PLANKS_SLAB) .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_SLAB) .add(NSE_Blocks.CROSS_DARK_OAK_PLANKS_SLAB) .add(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_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 10e7756..191c560 100644 --- a/src/main/java/su/a71/new_soviet/datagen/ModelGenerator.java +++ b/src/main/java/su/a71/new_soviet/datagen/ModelGenerator.java @@ -193,6 +193,8 @@ public class ModelGenerator extends FabricModelProvider { registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.CROSS_BIRCH_PLANKS, NSE_Blocks.CROSS_BIRCH_PLANKS_STAIRS, NSE_Blocks.CROSS_BIRCH_PLANKS_SLAB, "floor/planks"); registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS, NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_SLAB, "floor/planks"); registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.CROSS_CRIMSON_PLANKS, NSE_Blocks.CROSS_CRIMSON_PLANKS_STAIRS, NSE_Blocks.CROSS_CRIMSON_PLANKS_SLAB, "floor/planks"); + registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.HERRINGBONE_WARPED_PLANKS, NSE_Blocks.HERRINGBONE_WARPED_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_WARPED_PLANKS_SLAB, "floor/planks"); + registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.CROSS_WARPED_PLANKS, NSE_Blocks.CROSS_WARPED_PLANKS_STAIRS, NSE_Blocks.CROSS_WARPED_PLANKS_SLAB, "floor/planks"); registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS, NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_SLAB, "floor/planks"); registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.CROSS_DARK_OAK_PLANKS, NSE_Blocks.CROSS_DARK_OAK_PLANKS_STAIRS, NSE_Blocks.CROSS_DARK_OAK_PLANKS_SLAB, "floor/planks"); registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS, NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_SLAB, "floor/planks"); 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 f5d67aa..cd1aaf3 100644 --- a/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java +++ b/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java @@ -387,6 +387,11 @@ public class RecipeGenerator extends FabricRecipeProvider { list.add(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS); list.add(Blocks.CRIMSON_PLANKS); }), RecipeCategory.BUILDING_BLOCKS); + stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { + list.add(NSE_Blocks.CROSS_WARPED_PLANKS); + list.add(NSE_Blocks.HERRINGBONE_WARPED_PLANKS); + list.add(Blocks.WARPED_PLANKS); + }), RecipeCategory.BUILDING_BLOCKS); stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { list.add(NSE_Blocks.CROSS_DARK_OAK_PLANKS); list.add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS); @@ -708,6 +713,8 @@ public class RecipeGenerator extends FabricRecipeProvider { offerStairsAndSlab(exporter, NSE_Blocks.CROSS_BIRCH_PLANKS_STAIRS, NSE_Blocks.CROSS_BIRCH_PLANKS_SLAB, NSE_Blocks.CROSS_BIRCH_PLANKS); offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS); offerStairsAndSlab(exporter, NSE_Blocks.CROSS_CRIMSON_PLANKS_STAIRS, NSE_Blocks.CROSS_CRIMSON_PLANKS_SLAB, NSE_Blocks.CROSS_CRIMSON_PLANKS); + offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_WARPED_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_WARPED_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_WARPED_PLANKS); + offerStairsAndSlab(exporter, NSE_Blocks.CROSS_WARPED_PLANKS_STAIRS, NSE_Blocks.CROSS_WARPED_PLANKS_SLAB, NSE_Blocks.CROSS_WARPED_PLANKS); offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS); offerStairsAndSlab(exporter, NSE_Blocks.CROSS_DARK_OAK_PLANKS_STAIRS, NSE_Blocks.CROSS_DARK_OAK_PLANKS_SLAB, NSE_Blocks.CROSS_DARK_OAK_PLANKS); offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS); 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 c480d85..96a37bb 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 @@ -339,6 +339,12 @@ public class NSE_Blocks extends NSE_BaseRegistration { public static final Block CROSS_CRIMSON_PLANKS = new Block(FabricBlockSettings.copy(Blocks.CRIMSON_PLANKS)); public static final StairsBlock CROSS_CRIMSON_PLANKS_STAIRS = new StairsBlock(CROSS_CRIMSON_PLANKS.getDefaultState(), FabricBlockSettings.copy(CROSS_CRIMSON_PLANKS)); public static final SlabBlock CROSS_CRIMSON_PLANKS_SLAB = new SlabBlock(FabricBlockSettings.copy(CROSS_CRIMSON_PLANKS)); + public static final Block HERRINGBONE_WARPED_PLANKS = new Block(FabricBlockSettings.copy(Blocks.WARPED_PLANKS)); + public static final StairsBlock HERRINGBONE_WARPED_PLANKS_STAIRS = new StairsBlock(HERRINGBONE_WARPED_PLANKS.getDefaultState(), FabricBlockSettings.copy(HERRINGBONE_WARPED_PLANKS)); + public static final SlabBlock HERRINGBONE_WARPED_PLANKS_SLAB = new SlabBlock(FabricBlockSettings.copy(HERRINGBONE_WARPED_PLANKS)); + public static final Block CROSS_WARPED_PLANKS = new Block(FabricBlockSettings.copy(Blocks.WARPED_PLANKS)); + public static final StairsBlock CROSS_WARPED_PLANKS_STAIRS = new StairsBlock(CROSS_WARPED_PLANKS.getDefaultState(), FabricBlockSettings.copy(CROSS_WARPED_PLANKS)); + public static final SlabBlock CROSS_WARPED_PLANKS_SLAB = new SlabBlock(FabricBlockSettings.copy(CROSS_WARPED_PLANKS)); public static final Block HERRINGBONE_DARK_OAK_PLANKS = new Block(FabricBlockSettings.copy(Blocks.DARK_OAK_PLANKS)); public static final StairsBlock HERRINGBONE_DARK_OAK_PLANKS_STAIRS = new StairsBlock(HERRINGBONE_DARK_OAK_PLANKS.getDefaultState(), FabricBlockSettings.copy(HERRINGBONE_DARK_OAK_PLANKS)); public static final SlabBlock HERRINGBONE_DARK_OAK_PLANKS_SLAB = new SlabBlock(FabricBlockSettings.copy(HERRINGBONE_DARK_OAK_PLANKS)); @@ -800,6 +806,12 @@ public class NSE_Blocks extends NSE_BaseRegistration { registerBlock("cross_crimson_planks", () -> CROSS_CRIMSON_PLANKS, NSE_BUILDING_TAB); registerBlock("cross_crimson_planks_stairs", () -> CROSS_CRIMSON_PLANKS_STAIRS, NSE_BUILDING_TAB); registerBlock("cross_crimson_planks_slab", () -> CROSS_CRIMSON_PLANKS_SLAB, NSE_BUILDING_TAB); + registerBlock("herringbone_warped_planks", () -> HERRINGBONE_WARPED_PLANKS, NSE_BUILDING_TAB); + registerBlock("herringbone_warped_planks_stairs", () -> HERRINGBONE_WARPED_PLANKS_STAIRS, NSE_BUILDING_TAB); + registerBlock("herringbone_warped_planks_slab", () -> HERRINGBONE_WARPED_PLANKS_SLAB, NSE_BUILDING_TAB); + registerBlock("cross_warped_planks", () -> CROSS_WARPED_PLANKS, NSE_BUILDING_TAB); + registerBlock("cross_warped_planks_stairs", () -> CROSS_WARPED_PLANKS_STAIRS, NSE_BUILDING_TAB); + registerBlock("cross_warped_planks_slab", () -> CROSS_WARPED_PLANKS_SLAB, NSE_BUILDING_TAB); registerBlock("herringbone_dark_oak_planks", () -> HERRINGBONE_DARK_OAK_PLANKS, NSE_BUILDING_TAB); registerBlock("herringbone_dark_oak_planks_stairs", () -> HERRINGBONE_DARK_OAK_PLANKS_STAIRS, NSE_BUILDING_TAB); registerBlock("herringbone_dark_oak_planks_slab", () -> HERRINGBONE_DARK_OAK_PLANKS_SLAB, NSE_BUILDING_TAB); @@ -930,7 +942,7 @@ public class NSE_Blocks extends NSE_BaseRegistration { } public static void flammableInit() { - // Reminder: Crimson doesn't burn! + // Reminder: Crimson and Warped doesn't burn! FlammableBlockRegistry flammableBlockRegistry = FlammableBlockRegistry.getDefaultInstance(); flammableBlockRegistry.add(HERRINGBONE_ACACIA_PLANKS, 20, 5); flammableBlockRegistry.add(CROSS_ACACIA_PLANKS, 20, 5); diff --git a/src/main/resources/assets/new_soviet/lang/en_us.json b/src/main/resources/assets/new_soviet/lang/en_us.json index 5293b4f..bd07824 100644 --- a/src/main/resources/assets/new_soviet/lang/en_us.json +++ b/src/main/resources/assets/new_soviet/lang/en_us.json @@ -121,6 +121,8 @@ "block.new_soviet.cross_birch_planks": "Cross Birch Planks", "block.new_soviet.herringbone_crimson_planks": "Herringbone Crimson Planks", "block.new_soviet.cross_crimson_planks": "Cross Crimson Planks", + "block.new_soviet.herringbone_warped_planks": "Herringbone Warped Planks", + "block.new_soviet.cross_warped_planks": "Cross Warped Planks", "block.new_soviet.herringbone_dark_oak_planks": "Herringbone Dark Oak Planks", "block.new_soviet.cross_dark_oak_planks": "Cross Dark Oak Planks", "block.new_soviet.herringbone_jungle_planks": "Herringbone Jungle Planks", @@ -401,6 +403,10 @@ "block.new_soviet.herringbone_crimson_planks_stairs": "Herringbone Crimson Stairs", "block.new_soviet.cross_crimson_planks_slab": "Cross Crimson Slab", "block.new_soviet.cross_crimson_planks_stairs": "Cross Crimson Stairs", + "block.new_soviet.herringbone_warped_planks_slab": "Herringbone Warped Slab", + "block.new_soviet.herringbone_warped_planks_stairs": "Herringbone Warped Stairs", + "block.new_soviet.cross_warped_planks_slab": "Cross Warped Slab", + "block.new_soviet.cross_warped_planks_stairs": "Cross Warped Stairs", "block.new_soviet.herringbone_dark_oak_planks_slab": "Herringbone Dark Oak Slab", "block.new_soviet.herringbone_dark_oak_planks_stairs": "Herringbone Dark Oak Stairs", "block.new_soviet.cross_dark_oak_planks_slab": "Cross Dark Oak Slab", diff --git a/src/main/resources/assets/new_soviet/textures/block/floor/planks/cross_warped_planks.png b/src/main/resources/assets/new_soviet/textures/block/floor/planks/cross_warped_planks.png new file mode 100644 index 0000000..cbd23cb Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/floor/planks/cross_warped_planks.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/floor/planks/herringbone_warped_planks.png b/src/main/resources/assets/new_soviet/textures/block/floor/planks/herringbone_warped_planks.png new file mode 100644 index 0000000..c6ae13e Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/floor/planks/herringbone_warped_planks.png differ