From 6fb9c51fded5cc5133446218282606fec46635ce Mon Sep 17 00:00:00 2001 From: Andrew-71 Date: Sun, 22 Oct 2023 14:49:42 +0300 Subject: [PATCH] Add missing planks --- CHANGELOG | 2 + .../blockstates/cross_cherry_planks.json | 7 + .../blockstates/cross_cherry_planks_slab.json | 13 ++ .../cross_cherry_planks_stairs.json | 209 ++++++++++++++++++ .../herringbone_bamboo_planks.json | 7 + .../herringbone_bamboo_planks_slab.json | 13 ++ .../herringbone_bamboo_planks_stairs.json | 209 ++++++++++++++++++ .../herringbone_cherry_planks.json | 7 + .../herringbone_cherry_planks_slab.json | 13 ++ .../herringbone_cherry_planks_stairs.json | 209 ++++++++++++++++++ .../models/block/cross_cherry_planks.json | 6 + .../block/cross_cherry_planks_slab.json | 8 + .../block/cross_cherry_planks_slab_top.json | 8 + .../block/cross_cherry_planks_stairs.json | 8 + .../cross_cherry_planks_stairs_inner.json | 8 + .../cross_cherry_planks_stairs_outer.json | 8 + .../block/herringbone_bamboo_planks.json | 6 + .../block/herringbone_bamboo_planks_slab.json | 8 + .../herringbone_bamboo_planks_slab_top.json | 8 + .../herringbone_bamboo_planks_stairs.json | 8 + ...erringbone_bamboo_planks_stairs_inner.json | 8 + ...erringbone_bamboo_planks_stairs_outer.json | 8 + .../block/herringbone_cherry_planks.json | 6 + .../block/herringbone_cherry_planks_slab.json | 8 + .../herringbone_cherry_planks_slab_top.json | 8 + .../herringbone_cherry_planks_stairs.json | 8 + ...erringbone_cherry_planks_stairs_inner.json | 8 + ...erringbone_cherry_planks_stairs_outer.json | 8 + .../models/item/cross_cherry_planks.json | 3 + .../models/item/cross_cherry_planks_slab.json | 3 + .../item/cross_cherry_planks_stairs.json | 3 + .../item/herringbone_bamboo_planks.json | 3 + .../item/herringbone_bamboo_planks_slab.json | 3 + .../herringbone_bamboo_planks_stairs.json | 3 + .../item/herringbone_cherry_planks.json | 3 + .../item/herringbone_cherry_planks_slab.json | 3 + .../herringbone_cherry_planks_stairs.json | 3 + .../minecraft/tags/blocks/mineable/axe.json | 11 +- .../data/minecraft/tags/blocks/planks.json | 5 +- .../data/minecraft/tags/blocks/slabs.json | 5 +- .../data/minecraft/tags/blocks/stairs.json | 5 +- .../minecraft/tags/blocks/wooden_slabs.json | 5 +- .../minecraft/tags/blocks/wooden_stairs.json | 5 +- .../cross_cherry_planks_slab.json | 35 +++ ...from_cross_cherry_planks_stonecutting.json | 35 +++ .../cross_cherry_planks_stairs.json | 35 +++ ...from_cross_cherry_planks_stonecutting.json | 35 +++ .../herringbone_bamboo_planks_slab.json | 35 +++ ...erringbone_bamboo_planks_stonecutting.json | 35 +++ .../herringbone_bamboo_planks_stairs.json | 35 +++ ...erringbone_bamboo_planks_stonecutting.json | 35 +++ .../herringbone_cherry_planks_slab.json | 35 +++ ...erringbone_cherry_planks_stonecutting.json | 35 +++ .../herringbone_cherry_planks_stairs.json | 35 +++ ...erringbone_cherry_planks_stonecutting.json | 35 +++ .../blocks/cross_cherry_planks.json | 20 ++ .../blocks/cross_cherry_planks_slab.json | 20 ++ .../blocks/cross_cherry_planks_stairs.json | 20 ++ .../blocks/herringbone_bamboo_planks.json | 20 ++ .../herringbone_bamboo_planks_slab.json | 20 ++ .../herringbone_bamboo_planks_stairs.json | 20 ++ .../blocks/herringbone_cherry_planks.json | 20 ++ .../herringbone_cherry_planks_slab.json | 20 ++ .../herringbone_cherry_planks_stairs.json | 20 ++ .../recipes/cross_cherry_planks_slab.json | 17 ++ ...from_cross_cherry_planks_stonecutting.json | 8 + .../recipes/cross_cherry_planks_stairs.json | 19 ++ ...from_cross_cherry_planks_stonecutting.json | 8 + .../herringbone_bamboo_planks_slab.json | 17 ++ ...erringbone_bamboo_planks_stonecutting.json | 8 + .../herringbone_bamboo_planks_stairs.json | 19 ++ ...erringbone_bamboo_planks_stonecutting.json | 8 + .../herringbone_cherry_planks_slab.json | 17 ++ ...erringbone_cherry_planks_stonecutting.json | 8 + .../herringbone_cherry_planks_stairs.json | 19 ++ ...erringbone_cherry_planks_stonecutting.json | 8 + .../su/a71/new_soviet/blocks/TVBlock.java | 5 +- .../new_soviet/datagen/BlockLootTables.java | 9 + .../new_soviet/datagen/BlockTagGenerator.java | 36 ++- .../new_soviet/datagen/ModelGenerator.java | 4 + .../new_soviet/datagen/RecipeGenerator.java | 3 + .../new_soviet/registration/NSE_Blocks.java | 30 ++- .../assets/new_soviet/lang/en_us.json | 9 + .../floor/planks/cross_cherry_planks.png | Bin 0 -> 777 bytes .../planks/herringbone_bamboo_planks.png | Bin 0 -> 924 bytes .../planks/herringbone_cherry_planks.png | Bin 0 -> 808 bytes 86 files changed, 1728 insertions(+), 14 deletions(-) create mode 100644 src/main/generated/assets/new_soviet/blockstates/cross_cherry_planks.json create mode 100644 src/main/generated/assets/new_soviet/blockstates/cross_cherry_planks_slab.json create mode 100644 src/main/generated/assets/new_soviet/blockstates/cross_cherry_planks_stairs.json create mode 100644 src/main/generated/assets/new_soviet/blockstates/herringbone_bamboo_planks.json create mode 100644 src/main/generated/assets/new_soviet/blockstates/herringbone_bamboo_planks_slab.json create mode 100644 src/main/generated/assets/new_soviet/blockstates/herringbone_bamboo_planks_stairs.json create mode 100644 src/main/generated/assets/new_soviet/blockstates/herringbone_cherry_planks.json create mode 100644 src/main/generated/assets/new_soviet/blockstates/herringbone_cherry_planks_slab.json create mode 100644 src/main/generated/assets/new_soviet/blockstates/herringbone_cherry_planks_stairs.json create mode 100644 src/main/generated/assets/new_soviet/models/block/cross_cherry_planks.json create mode 100644 src/main/generated/assets/new_soviet/models/block/cross_cherry_planks_slab.json create mode 100644 src/main/generated/assets/new_soviet/models/block/cross_cherry_planks_slab_top.json create mode 100644 src/main/generated/assets/new_soviet/models/block/cross_cherry_planks_stairs.json create mode 100644 src/main/generated/assets/new_soviet/models/block/cross_cherry_planks_stairs_inner.json create mode 100644 src/main/generated/assets/new_soviet/models/block/cross_cherry_planks_stairs_outer.json create mode 100644 src/main/generated/assets/new_soviet/models/block/herringbone_bamboo_planks.json create mode 100644 src/main/generated/assets/new_soviet/models/block/herringbone_bamboo_planks_slab.json create mode 100644 src/main/generated/assets/new_soviet/models/block/herringbone_bamboo_planks_slab_top.json create mode 100644 src/main/generated/assets/new_soviet/models/block/herringbone_bamboo_planks_stairs.json create mode 100644 src/main/generated/assets/new_soviet/models/block/herringbone_bamboo_planks_stairs_inner.json create mode 100644 src/main/generated/assets/new_soviet/models/block/herringbone_bamboo_planks_stairs_outer.json create mode 100644 src/main/generated/assets/new_soviet/models/block/herringbone_cherry_planks.json create mode 100644 src/main/generated/assets/new_soviet/models/block/herringbone_cherry_planks_slab.json create mode 100644 src/main/generated/assets/new_soviet/models/block/herringbone_cherry_planks_slab_top.json create mode 100644 src/main/generated/assets/new_soviet/models/block/herringbone_cherry_planks_stairs.json create mode 100644 src/main/generated/assets/new_soviet/models/block/herringbone_cherry_planks_stairs_inner.json create mode 100644 src/main/generated/assets/new_soviet/models/block/herringbone_cherry_planks_stairs_outer.json create mode 100644 src/main/generated/assets/new_soviet/models/item/cross_cherry_planks.json create mode 100644 src/main/generated/assets/new_soviet/models/item/cross_cherry_planks_slab.json create mode 100644 src/main/generated/assets/new_soviet/models/item/cross_cherry_planks_stairs.json create mode 100644 src/main/generated/assets/new_soviet/models/item/herringbone_bamboo_planks.json create mode 100644 src/main/generated/assets/new_soviet/models/item/herringbone_bamboo_planks_slab.json create mode 100644 src/main/generated/assets/new_soviet/models/item/herringbone_bamboo_planks_stairs.json create mode 100644 src/main/generated/assets/new_soviet/models/item/herringbone_cherry_planks.json create mode 100644 src/main/generated/assets/new_soviet/models/item/herringbone_cherry_planks_slab.json create mode 100644 src/main/generated/assets/new_soviet/models/item/herringbone_cherry_planks_stairs.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_cherry_planks_slab.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_cherry_planks_slab_from_cross_cherry_planks_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_cherry_planks_stairs.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_cherry_planks_stairs_from_cross_cherry_planks_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_bamboo_planks_slab.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_bamboo_planks_slab_from_herringbone_bamboo_planks_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_bamboo_planks_stairs.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_bamboo_planks_stairs_from_herringbone_bamboo_planks_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_cherry_planks_slab.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_cherry_planks_slab_from_herringbone_cherry_planks_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_cherry_planks_stairs.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_cherry_planks_stairs_from_herringbone_cherry_planks_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/loot_tables/blocks/cross_cherry_planks.json create mode 100644 src/main/generated/data/new_soviet/loot_tables/blocks/cross_cherry_planks_slab.json create mode 100644 src/main/generated/data/new_soviet/loot_tables/blocks/cross_cherry_planks_stairs.json create mode 100644 src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_bamboo_planks.json create mode 100644 src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_bamboo_planks_slab.json create mode 100644 src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_bamboo_planks_stairs.json create mode 100644 src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_cherry_planks.json create mode 100644 src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_cherry_planks_slab.json create mode 100644 src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_cherry_planks_stairs.json create mode 100644 src/main/generated/data/new_soviet/recipes/cross_cherry_planks_slab.json create mode 100644 src/main/generated/data/new_soviet/recipes/cross_cherry_planks_slab_from_cross_cherry_planks_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/recipes/cross_cherry_planks_stairs.json create mode 100644 src/main/generated/data/new_soviet/recipes/cross_cherry_planks_stairs_from_cross_cherry_planks_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/recipes/herringbone_bamboo_planks_slab.json create mode 100644 src/main/generated/data/new_soviet/recipes/herringbone_bamboo_planks_slab_from_herringbone_bamboo_planks_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/recipes/herringbone_bamboo_planks_stairs.json create mode 100644 src/main/generated/data/new_soviet/recipes/herringbone_bamboo_planks_stairs_from_herringbone_bamboo_planks_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/recipes/herringbone_cherry_planks_slab.json create mode 100644 src/main/generated/data/new_soviet/recipes/herringbone_cherry_planks_slab_from_herringbone_cherry_planks_stonecutting.json create mode 100644 src/main/generated/data/new_soviet/recipes/herringbone_cherry_planks_stairs.json create mode 100644 src/main/generated/data/new_soviet/recipes/herringbone_cherry_planks_stairs_from_herringbone_cherry_planks_stonecutting.json create mode 100644 src/main/resources/assets/new_soviet/textures/block/floor/planks/cross_cherry_planks.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/floor/planks/herringbone_bamboo_planks.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/floor/planks/herringbone_cherry_planks.png diff --git a/CHANGELOG b/CHANGELOG index e675da4..252e914 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -31,10 +31,12 @@ This version focuses on QOL and bug fixes * Added Russian translation (ru_ru) +* Added missing cherry and bamboo planks * Added button to open config file when using Mod Menu * Added several new achievements and challenges * Minor bug fixes * Fixed issue with some blocks being non opaque + * Fixed TV's hitbox * Switches no longer emit redstone particle * Slightly improved cigarette's GUI model * Technical changes diff --git a/src/main/generated/assets/new_soviet/blockstates/cross_cherry_planks.json b/src/main/generated/assets/new_soviet/blockstates/cross_cherry_planks.json new file mode 100644 index 0000000..e642ff9 --- /dev/null +++ b/src/main/generated/assets/new_soviet/blockstates/cross_cherry_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/cross_cherry_planks" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/blockstates/cross_cherry_planks_slab.json b/src/main/generated/assets/new_soviet/blockstates/cross_cherry_planks_slab.json new file mode 100644 index 0000000..7bb8316 --- /dev/null +++ b/src/main/generated/assets/new_soviet/blockstates/cross_cherry_planks_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "new_soviet:block/cross_cherry_planks_slab" + }, + "type=double": { + "model": "new_soviet:block/cross_cherry_planks" + }, + "type=top": { + "model": "new_soviet:block/cross_cherry_planks_slab_top" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/blockstates/cross_cherry_planks_stairs.json b/src/main/generated/assets/new_soviet/blockstates/cross_cherry_planks_stairs.json new file mode 100644 index 0000000..768f099 --- /dev/null +++ b/src/main/generated/assets/new_soviet/blockstates/cross_cherry_planks_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "new_soviet:block/cross_cherry_planks_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "new_soviet:block/cross_cherry_planks_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "new_soviet:block/cross_cherry_planks_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "new_soviet:block/cross_cherry_planks_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "new_soviet:block/cross_cherry_planks_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "new_soviet:block/cross_cherry_planks_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "new_soviet:block/cross_cherry_planks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "new_soviet:block/cross_cherry_planks_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "new_soviet:block/cross_cherry_planks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "new_soviet:block/cross_cherry_planks_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "new_soviet:block/cross_cherry_planks_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "new_soviet:block/cross_cherry_planks_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "new_soviet:block/cross_cherry_planks_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "new_soviet:block/cross_cherry_planks_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "new_soviet:block/cross_cherry_planks_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "new_soviet:block/cross_cherry_planks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "new_soviet:block/cross_cherry_planks_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "new_soviet:block/cross_cherry_planks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "new_soviet:block/cross_cherry_planks_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "new_soviet:block/cross_cherry_planks_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "new_soviet:block/cross_cherry_planks_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "new_soviet:block/cross_cherry_planks_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "new_soviet:block/cross_cherry_planks_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "new_soviet:block/cross_cherry_planks_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "new_soviet:block/cross_cherry_planks_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "new_soviet:block/cross_cherry_planks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "new_soviet:block/cross_cherry_planks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "new_soviet:block/cross_cherry_planks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "new_soviet:block/cross_cherry_planks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "new_soviet:block/cross_cherry_planks_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "new_soviet:block/cross_cherry_planks_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "new_soviet:block/cross_cherry_planks_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "new_soviet:block/cross_cherry_planks_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "new_soviet:block/cross_cherry_planks_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "new_soviet:block/cross_cherry_planks_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "new_soviet:block/cross_cherry_planks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "new_soviet:block/cross_cherry_planks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "new_soviet:block/cross_cherry_planks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "new_soviet:block/cross_cherry_planks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "new_soviet:block/cross_cherry_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_bamboo_planks.json b/src/main/generated/assets/new_soviet/blockstates/herringbone_bamboo_planks.json new file mode 100644 index 0000000..171881a --- /dev/null +++ b/src/main/generated/assets/new_soviet/blockstates/herringbone_bamboo_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/herringbone_bamboo_planks" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/blockstates/herringbone_bamboo_planks_slab.json b/src/main/generated/assets/new_soviet/blockstates/herringbone_bamboo_planks_slab.json new file mode 100644 index 0000000..9472ce5 --- /dev/null +++ b/src/main/generated/assets/new_soviet/blockstates/herringbone_bamboo_planks_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "new_soviet:block/herringbone_bamboo_planks_slab" + }, + "type=double": { + "model": "new_soviet:block/herringbone_bamboo_planks" + }, + "type=top": { + "model": "new_soviet:block/herringbone_bamboo_planks_slab_top" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/blockstates/herringbone_bamboo_planks_stairs.json b/src/main/generated/assets/new_soviet/blockstates/herringbone_bamboo_planks_stairs.json new file mode 100644 index 0000000..c529af0 --- /dev/null +++ b/src/main/generated/assets/new_soviet/blockstates/herringbone_bamboo_planks_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "new_soviet:block/herringbone_bamboo_planks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "new_soviet:block/herringbone_bamboo_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_cherry_planks.json b/src/main/generated/assets/new_soviet/blockstates/herringbone_cherry_planks.json new file mode 100644 index 0000000..0178e4b --- /dev/null +++ b/src/main/generated/assets/new_soviet/blockstates/herringbone_cherry_planks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/herringbone_cherry_planks" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/blockstates/herringbone_cherry_planks_slab.json b/src/main/generated/assets/new_soviet/blockstates/herringbone_cherry_planks_slab.json new file mode 100644 index 0000000..36a0a04 --- /dev/null +++ b/src/main/generated/assets/new_soviet/blockstates/herringbone_cherry_planks_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "new_soviet:block/herringbone_cherry_planks_slab" + }, + "type=double": { + "model": "new_soviet:block/herringbone_cherry_planks" + }, + "type=top": { + "model": "new_soviet:block/herringbone_cherry_planks_slab_top" + } + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/blockstates/herringbone_cherry_planks_stairs.json b/src/main/generated/assets/new_soviet/blockstates/herringbone_cherry_planks_stairs.json new file mode 100644 index 0000000..5758fb3 --- /dev/null +++ b/src/main/generated/assets/new_soviet/blockstates/herringbone_cherry_planks_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "new_soviet:block/herringbone_cherry_planks_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "new_soviet:block/herringbone_cherry_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_cherry_planks.json b/src/main/generated/assets/new_soviet/models/block/cross_cherry_planks.json new file mode 100644 index 0000000..9268fac --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/cross_cherry_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "new_soviet:block/floor/planks/cross_cherry_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cross_cherry_planks_slab.json b/src/main/generated/assets/new_soviet/models/block/cross_cherry_planks_slab.json new file mode 100644 index 0000000..2670d6e --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/cross_cherry_planks_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "new_soviet:block/floor/planks/cross_cherry_planks", + "side": "new_soviet:block/floor/planks/cross_cherry_planks", + "top": "new_soviet:block/floor/planks/cross_cherry_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cross_cherry_planks_slab_top.json b/src/main/generated/assets/new_soviet/models/block/cross_cherry_planks_slab_top.json new file mode 100644 index 0000000..e1cae94 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/cross_cherry_planks_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "new_soviet:block/floor/planks/cross_cherry_planks", + "side": "new_soviet:block/floor/planks/cross_cherry_planks", + "top": "new_soviet:block/floor/planks/cross_cherry_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cross_cherry_planks_stairs.json b/src/main/generated/assets/new_soviet/models/block/cross_cherry_planks_stairs.json new file mode 100644 index 0000000..a2918c5 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/cross_cherry_planks_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "new_soviet:block/floor/planks/cross_cherry_planks", + "side": "new_soviet:block/floor/planks/cross_cherry_planks", + "top": "new_soviet:block/floor/planks/cross_cherry_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cross_cherry_planks_stairs_inner.json b/src/main/generated/assets/new_soviet/models/block/cross_cherry_planks_stairs_inner.json new file mode 100644 index 0000000..43f1514 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/cross_cherry_planks_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "new_soviet:block/floor/planks/cross_cherry_planks", + "side": "new_soviet:block/floor/planks/cross_cherry_planks", + "top": "new_soviet:block/floor/planks/cross_cherry_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cross_cherry_planks_stairs_outer.json b/src/main/generated/assets/new_soviet/models/block/cross_cherry_planks_stairs_outer.json new file mode 100644 index 0000000..4dc7a24 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/cross_cherry_planks_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "new_soviet:block/floor/planks/cross_cherry_planks", + "side": "new_soviet:block/floor/planks/cross_cherry_planks", + "top": "new_soviet:block/floor/planks/cross_cherry_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_bamboo_planks.json b/src/main/generated/assets/new_soviet/models/block/herringbone_bamboo_planks.json new file mode 100644 index 0000000..0d333dc --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/herringbone_bamboo_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "new_soviet:block/floor/planks/herringbone_bamboo_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_bamboo_planks_slab.json b/src/main/generated/assets/new_soviet/models/block/herringbone_bamboo_planks_slab.json new file mode 100644 index 0000000..aeab2a4 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/herringbone_bamboo_planks_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "new_soviet:block/floor/planks/herringbone_bamboo_planks", + "side": "new_soviet:block/floor/planks/herringbone_bamboo_planks", + "top": "new_soviet:block/floor/planks/herringbone_bamboo_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_bamboo_planks_slab_top.json b/src/main/generated/assets/new_soviet/models/block/herringbone_bamboo_planks_slab_top.json new file mode 100644 index 0000000..15346ef --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/herringbone_bamboo_planks_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "new_soviet:block/floor/planks/herringbone_bamboo_planks", + "side": "new_soviet:block/floor/planks/herringbone_bamboo_planks", + "top": "new_soviet:block/floor/planks/herringbone_bamboo_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_bamboo_planks_stairs.json b/src/main/generated/assets/new_soviet/models/block/herringbone_bamboo_planks_stairs.json new file mode 100644 index 0000000..2a5952c --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/herringbone_bamboo_planks_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "new_soviet:block/floor/planks/herringbone_bamboo_planks", + "side": "new_soviet:block/floor/planks/herringbone_bamboo_planks", + "top": "new_soviet:block/floor/planks/herringbone_bamboo_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_bamboo_planks_stairs_inner.json b/src/main/generated/assets/new_soviet/models/block/herringbone_bamboo_planks_stairs_inner.json new file mode 100644 index 0000000..69e6641 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/herringbone_bamboo_planks_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "new_soviet:block/floor/planks/herringbone_bamboo_planks", + "side": "new_soviet:block/floor/planks/herringbone_bamboo_planks", + "top": "new_soviet:block/floor/planks/herringbone_bamboo_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_bamboo_planks_stairs_outer.json b/src/main/generated/assets/new_soviet/models/block/herringbone_bamboo_planks_stairs_outer.json new file mode 100644 index 0000000..c8a8565 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/herringbone_bamboo_planks_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "new_soviet:block/floor/planks/herringbone_bamboo_planks", + "side": "new_soviet:block/floor/planks/herringbone_bamboo_planks", + "top": "new_soviet:block/floor/planks/herringbone_bamboo_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_cherry_planks.json b/src/main/generated/assets/new_soviet/models/block/herringbone_cherry_planks.json new file mode 100644 index 0000000..fdb2903 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/herringbone_cherry_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "new_soviet:block/floor/planks/herringbone_cherry_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_cherry_planks_slab.json b/src/main/generated/assets/new_soviet/models/block/herringbone_cherry_planks_slab.json new file mode 100644 index 0000000..c7ed88b --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/herringbone_cherry_planks_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "new_soviet:block/floor/planks/herringbone_cherry_planks", + "side": "new_soviet:block/floor/planks/herringbone_cherry_planks", + "top": "new_soviet:block/floor/planks/herringbone_cherry_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_cherry_planks_slab_top.json b/src/main/generated/assets/new_soviet/models/block/herringbone_cherry_planks_slab_top.json new file mode 100644 index 0000000..22c98bc --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/herringbone_cherry_planks_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "new_soviet:block/floor/planks/herringbone_cherry_planks", + "side": "new_soviet:block/floor/planks/herringbone_cherry_planks", + "top": "new_soviet:block/floor/planks/herringbone_cherry_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_cherry_planks_stairs.json b/src/main/generated/assets/new_soviet/models/block/herringbone_cherry_planks_stairs.json new file mode 100644 index 0000000..2c0ac9a --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/herringbone_cherry_planks_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "new_soviet:block/floor/planks/herringbone_cherry_planks", + "side": "new_soviet:block/floor/planks/herringbone_cherry_planks", + "top": "new_soviet:block/floor/planks/herringbone_cherry_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_cherry_planks_stairs_inner.json b/src/main/generated/assets/new_soviet/models/block/herringbone_cherry_planks_stairs_inner.json new file mode 100644 index 0000000..f632cee --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/herringbone_cherry_planks_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "new_soviet:block/floor/planks/herringbone_cherry_planks", + "side": "new_soviet:block/floor/planks/herringbone_cherry_planks", + "top": "new_soviet:block/floor/planks/herringbone_cherry_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_cherry_planks_stairs_outer.json b/src/main/generated/assets/new_soviet/models/block/herringbone_cherry_planks_stairs_outer.json new file mode 100644 index 0000000..40e3a18 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/block/herringbone_cherry_planks_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "new_soviet:block/floor/planks/herringbone_cherry_planks", + "side": "new_soviet:block/floor/planks/herringbone_cherry_planks", + "top": "new_soviet:block/floor/planks/herringbone_cherry_planks" + } +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/cross_cherry_planks.json b/src/main/generated/assets/new_soviet/models/item/cross_cherry_planks.json new file mode 100644 index 0000000..08fa695 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/item/cross_cherry_planks.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/cross_cherry_planks" +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/cross_cherry_planks_slab.json b/src/main/generated/assets/new_soviet/models/item/cross_cherry_planks_slab.json new file mode 100644 index 0000000..d0f1b78 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/item/cross_cherry_planks_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/cross_cherry_planks_slab" +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/cross_cherry_planks_stairs.json b/src/main/generated/assets/new_soviet/models/item/cross_cherry_planks_stairs.json new file mode 100644 index 0000000..a090075 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/item/cross_cherry_planks_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/cross_cherry_planks_stairs" +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/herringbone_bamboo_planks.json b/src/main/generated/assets/new_soviet/models/item/herringbone_bamboo_planks.json new file mode 100644 index 0000000..d85c450 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/item/herringbone_bamboo_planks.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/herringbone_bamboo_planks" +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/herringbone_bamboo_planks_slab.json b/src/main/generated/assets/new_soviet/models/item/herringbone_bamboo_planks_slab.json new file mode 100644 index 0000000..e45a723 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/item/herringbone_bamboo_planks_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/herringbone_bamboo_planks_slab" +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/herringbone_bamboo_planks_stairs.json b/src/main/generated/assets/new_soviet/models/item/herringbone_bamboo_planks_stairs.json new file mode 100644 index 0000000..7031288 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/item/herringbone_bamboo_planks_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/herringbone_bamboo_planks_stairs" +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/herringbone_cherry_planks.json b/src/main/generated/assets/new_soviet/models/item/herringbone_cherry_planks.json new file mode 100644 index 0000000..de8ef28 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/item/herringbone_cherry_planks.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/herringbone_cherry_planks" +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/herringbone_cherry_planks_slab.json b/src/main/generated/assets/new_soviet/models/item/herringbone_cherry_planks_slab.json new file mode 100644 index 0000000..1fa5e32 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/item/herringbone_cherry_planks_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/herringbone_cherry_planks_slab" +} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/item/herringbone_cherry_planks_stairs.json b/src/main/generated/assets/new_soviet/models/item/herringbone_cherry_planks_stairs.json new file mode 100644 index 0000000..d3fc235 --- /dev/null +++ b/src/main/generated/assets/new_soviet/models/item/herringbone_cherry_planks_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/herringbone_cherry_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 3a380e4..ffdb8e0 100644 --- a/src/main/generated/data/minecraft/tags/blocks/mineable/axe.json +++ b/src/main/generated/data/minecraft/tags/blocks/mineable/axe.json @@ -90,6 +90,15 @@ "new_soviet:brown_linoleum_slab", "new_soviet:cyan_linoleum_stairs", "new_soviet:cyan_linoleum_slab", - "new_soviet:table_lamp" + "new_soviet:table_lamp", + "new_soviet:cross_cherry_planks", + "new_soviet:cross_cherry_planks_stairs", + "new_soviet:cross_cherry_planks_slab", + "new_soviet:herringbone_cherry_planks_stairs", + "new_soviet:herringbone_cherry_planks_slab", + "new_soviet:herringbone_cherry_planks", + "new_soviet:herringbone_bamboo_planks_stairs", + "new_soviet:herringbone_bamboo_planks_slab", + "new_soviet:herringbone_bamboo_planks" ] } \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/blocks/planks.json b/src/main/generated/data/minecraft/tags/blocks/planks.json index 7cc401e..7daa79c 100644 --- a/src/main/generated/data/minecraft/tags/blocks/planks.json +++ b/src/main/generated/data/minecraft/tags/blocks/planks.json @@ -16,6 +16,9 @@ "new_soviet:herringbone_mangrove_planks", "new_soviet:cross_mangrove_planks", "new_soviet:herringbone_spruce_planks", - "new_soviet:cross_spruce_planks" + "new_soviet:cross_spruce_planks", + "new_soviet:cross_cherry_planks", + "new_soviet:herringbone_cherry_planks", + "new_soviet:herringbone_bamboo_planks" ] } \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/blocks/slabs.json b/src/main/generated/data/minecraft/tags/blocks/slabs.json index f67a555..138d00b 100644 --- a/src/main/generated/data/minecraft/tags/blocks/slabs.json +++ b/src/main/generated/data/minecraft/tags/blocks/slabs.json @@ -102,6 +102,9 @@ "new_soviet:orange_linoleum_slab", "new_soviet:brown_linoleum_slab", "new_soviet:cyan_linoleum_slab", - "new_soviet:metal_plating_slab" + "new_soviet:metal_plating_slab", + "new_soviet:herringbone_bamboo_planks_slab", + "new_soviet:cross_cherry_planks_slab", + "new_soviet:herringbone_cherry_planks_slab" ] } \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/blocks/stairs.json b/src/main/generated/data/minecraft/tags/blocks/stairs.json index 2e4ae46..ecf5e8e 100644 --- a/src/main/generated/data/minecraft/tags/blocks/stairs.json +++ b/src/main/generated/data/minecraft/tags/blocks/stairs.json @@ -102,6 +102,9 @@ "new_soviet:orange_linoleum_stairs", "new_soviet:brown_linoleum_stairs", "new_soviet:cyan_linoleum_stairs", - "new_soviet:metal_plating_stairs" + "new_soviet:metal_plating_stairs", + "new_soviet:herringbone_bamboo_planks_stairs", + "new_soviet:cross_cherry_planks_stairs", + "new_soviet:herringbone_cherry_planks_stairs" ] } \ No newline at end of file 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 82b60b7..232680a 100644 --- a/src/main/generated/data/minecraft/tags/blocks/wooden_slabs.json +++ b/src/main/generated/data/minecraft/tags/blocks/wooden_slabs.json @@ -16,6 +16,9 @@ "new_soviet:herringbone_mangrove_planks_slab", "new_soviet:cross_mangrove_planks_slab", "new_soviet:herringbone_spruce_planks_slab", - "new_soviet:cross_spruce_planks_slab" + "new_soviet:cross_spruce_planks_slab", + "new_soviet:herringbone_bamboo_planks_slab", + "new_soviet:cross_cherry_planks_slab", + "new_soviet:herringbone_cherry_planks_slab" ] } \ No newline at end of file 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 11db5d8..4ba84ae 100644 --- a/src/main/generated/data/minecraft/tags/blocks/wooden_stairs.json +++ b/src/main/generated/data/minecraft/tags/blocks/wooden_stairs.json @@ -16,6 +16,9 @@ "new_soviet:herringbone_mangrove_planks_stairs", "new_soviet:cross_mangrove_planks_stairs", "new_soviet:herringbone_spruce_planks_stairs", - "new_soviet:cross_spruce_planks_stairs" + "new_soviet:cross_spruce_planks_stairs", + "new_soviet:herringbone_bamboo_planks_stairs", + "new_soviet:cross_cherry_planks_stairs", + "new_soviet:herringbone_cherry_planks_stairs" ] } \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_cherry_planks_slab.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_cherry_planks_slab.json new file mode 100644 index 0000000..d77821a --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_cherry_planks_slab.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cross_cherry_planks": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:cross_cherry_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:cross_cherry_planks_slab" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cross_cherry_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:cross_cherry_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_cherry_planks_slab_from_cross_cherry_planks_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_cherry_planks_slab_from_cross_cherry_planks_stonecutting.json new file mode 100644 index 0000000..30a415a --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_cherry_planks_slab_from_cross_cherry_planks_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cross_cherry_planks": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:cross_cherry_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:cross_cherry_planks_slab_from_cross_cherry_planks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cross_cherry_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:cross_cherry_planks_slab_from_cross_cherry_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_cherry_planks_stairs.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_cherry_planks_stairs.json new file mode 100644 index 0000000..14308bd --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_cherry_planks_stairs.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cross_cherry_planks": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:cross_cherry_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:cross_cherry_planks_stairs" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cross_cherry_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:cross_cherry_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_cherry_planks_stairs_from_cross_cherry_planks_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_cherry_planks_stairs_from_cross_cherry_planks_stonecutting.json new file mode 100644 index 0000000..5b9f67d --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/cross_cherry_planks_stairs_from_cross_cherry_planks_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cross_cherry_planks": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:cross_cherry_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:cross_cherry_planks_stairs_from_cross_cherry_planks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cross_cherry_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:cross_cherry_planks_stairs_from_cross_cherry_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_bamboo_planks_slab.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_bamboo_planks_slab.json new file mode 100644 index 0000000..4f08875 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_bamboo_planks_slab.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_herringbone_bamboo_planks": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:herringbone_bamboo_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:herringbone_bamboo_planks_slab" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_herringbone_bamboo_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:herringbone_bamboo_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_bamboo_planks_slab_from_herringbone_bamboo_planks_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_bamboo_planks_slab_from_herringbone_bamboo_planks_stonecutting.json new file mode 100644 index 0000000..9ed729c --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_bamboo_planks_slab_from_herringbone_bamboo_planks_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_herringbone_bamboo_planks": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:herringbone_bamboo_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:herringbone_bamboo_planks_slab_from_herringbone_bamboo_planks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_herringbone_bamboo_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:herringbone_bamboo_planks_slab_from_herringbone_bamboo_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_bamboo_planks_stairs.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_bamboo_planks_stairs.json new file mode 100644 index 0000000..8995e82 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_bamboo_planks_stairs.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_herringbone_bamboo_planks": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:herringbone_bamboo_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:herringbone_bamboo_planks_stairs" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_herringbone_bamboo_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:herringbone_bamboo_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_bamboo_planks_stairs_from_herringbone_bamboo_planks_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_bamboo_planks_stairs_from_herringbone_bamboo_planks_stonecutting.json new file mode 100644 index 0000000..e844c1f --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_bamboo_planks_stairs_from_herringbone_bamboo_planks_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_herringbone_bamboo_planks": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:herringbone_bamboo_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:herringbone_bamboo_planks_stairs_from_herringbone_bamboo_planks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_herringbone_bamboo_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:herringbone_bamboo_planks_stairs_from_herringbone_bamboo_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_cherry_planks_slab.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_cherry_planks_slab.json new file mode 100644 index 0000000..a380174 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_cherry_planks_slab.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_herringbone_cherry_planks": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:herringbone_cherry_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:herringbone_cherry_planks_slab" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_herringbone_cherry_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:herringbone_cherry_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_cherry_planks_slab_from_herringbone_cherry_planks_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_cherry_planks_slab_from_herringbone_cherry_planks_stonecutting.json new file mode 100644 index 0000000..d9a854f --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_cherry_planks_slab_from_herringbone_cherry_planks_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_herringbone_cherry_planks": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:herringbone_cherry_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:herringbone_cherry_planks_slab_from_herringbone_cherry_planks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_herringbone_cherry_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:herringbone_cherry_planks_slab_from_herringbone_cherry_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_cherry_planks_stairs.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_cherry_planks_stairs.json new file mode 100644 index 0000000..67ea8b9 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_cherry_planks_stairs.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_herringbone_cherry_planks": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:herringbone_cherry_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:herringbone_cherry_planks_stairs" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_herringbone_cherry_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:herringbone_cherry_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_cherry_planks_stairs_from_herringbone_cherry_planks_stonecutting.json b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_cherry_planks_stairs_from_herringbone_cherry_planks_stonecutting.json new file mode 100644 index 0000000..89a1433 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/herringbone_cherry_planks_stairs_from_herringbone_cherry_planks_stonecutting.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_herringbone_cherry_planks": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:herringbone_cherry_planks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:herringbone_cherry_planks_stairs_from_herringbone_cherry_planks_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_herringbone_cherry_planks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:herringbone_cherry_planks_stairs_from_herringbone_cherry_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_cherry_planks.json b/src/main/generated/data/new_soviet/loot_tables/blocks/cross_cherry_planks.json new file mode 100644 index 0000000..0513010 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/cross_cherry_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_cherry_planks" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/cross_cherry_planks_slab.json b/src/main/generated/data/new_soviet/loot_tables/blocks/cross_cherry_planks_slab.json new file mode 100644 index 0000000..17877a2 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/cross_cherry_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_cherry_planks_slab" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/cross_cherry_planks_stairs.json b/src/main/generated/data/new_soviet/loot_tables/blocks/cross_cherry_planks_stairs.json new file mode 100644 index 0000000..6c7b447 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/cross_cherry_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_cherry_planks_stairs" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_bamboo_planks.json b/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_bamboo_planks.json new file mode 100644 index 0000000..4b75560 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_bamboo_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_bamboo_planks" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_bamboo_planks_slab.json b/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_bamboo_planks_slab.json new file mode 100644 index 0000000..d129d61 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_bamboo_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_bamboo_planks_slab" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_bamboo_planks_stairs.json b/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_bamboo_planks_stairs.json new file mode 100644 index 0000000..1e5657a --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_bamboo_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_bamboo_planks_stairs" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_cherry_planks.json b/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_cherry_planks.json new file mode 100644 index 0000000..ff99d8a --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_cherry_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_cherry_planks" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_cherry_planks_slab.json b/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_cherry_planks_slab.json new file mode 100644 index 0000000..2a8483f --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_cherry_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_cherry_planks_slab" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_cherry_planks_stairs.json b/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_cherry_planks_stairs.json new file mode 100644 index 0000000..f6312d2 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/herringbone_cherry_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_cherry_planks_stairs" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cross_cherry_planks_slab.json b/src/main/generated/data/new_soviet/recipes/cross_cherry_planks_slab.json new file mode 100644 index 0000000..feb212a --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cross_cherry_planks_slab.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "new_soviet:cross_cherry_planks" + } + }, + "pattern": [ + "###" + ], + "result": { + "count": 6, + "item": "new_soviet:cross_cherry_planks_slab" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cross_cherry_planks_slab_from_cross_cherry_planks_stonecutting.json b/src/main/generated/data/new_soviet/recipes/cross_cherry_planks_slab_from_cross_cherry_planks_stonecutting.json new file mode 100644 index 0000000..87123b0 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cross_cherry_planks_slab_from_cross_cherry_planks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:cross_cherry_planks" + }, + "result": "new_soviet:cross_cherry_planks_slab" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cross_cherry_planks_stairs.json b/src/main/generated/data/new_soviet/recipes/cross_cherry_planks_stairs.json new file mode 100644 index 0000000..65fd3dd --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cross_cherry_planks_stairs.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "new_soviet:cross_cherry_planks" + } + }, + "pattern": [ + "# ", + "## ", + "###" + ], + "result": { + "count": 4, + "item": "new_soviet:cross_cherry_planks_stairs" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cross_cherry_planks_stairs_from_cross_cherry_planks_stonecutting.json b/src/main/generated/data/new_soviet/recipes/cross_cherry_planks_stairs_from_cross_cherry_planks_stonecutting.json new file mode 100644 index 0000000..fed0dd6 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cross_cherry_planks_stairs_from_cross_cherry_planks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:cross_cherry_planks" + }, + "result": "new_soviet:cross_cherry_planks_stairs" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/herringbone_bamboo_planks_slab.json b/src/main/generated/data/new_soviet/recipes/herringbone_bamboo_planks_slab.json new file mode 100644 index 0000000..e42fee1 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/herringbone_bamboo_planks_slab.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "new_soviet:herringbone_bamboo_planks" + } + }, + "pattern": [ + "###" + ], + "result": { + "count": 6, + "item": "new_soviet:herringbone_bamboo_planks_slab" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/herringbone_bamboo_planks_slab_from_herringbone_bamboo_planks_stonecutting.json b/src/main/generated/data/new_soviet/recipes/herringbone_bamboo_planks_slab_from_herringbone_bamboo_planks_stonecutting.json new file mode 100644 index 0000000..5499862 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/herringbone_bamboo_planks_slab_from_herringbone_bamboo_planks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:herringbone_bamboo_planks" + }, + "result": "new_soviet:herringbone_bamboo_planks_slab" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/herringbone_bamboo_planks_stairs.json b/src/main/generated/data/new_soviet/recipes/herringbone_bamboo_planks_stairs.json new file mode 100644 index 0000000..8ad357c --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/herringbone_bamboo_planks_stairs.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "new_soviet:herringbone_bamboo_planks" + } + }, + "pattern": [ + "# ", + "## ", + "###" + ], + "result": { + "count": 4, + "item": "new_soviet:herringbone_bamboo_planks_stairs" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/herringbone_bamboo_planks_stairs_from_herringbone_bamboo_planks_stonecutting.json b/src/main/generated/data/new_soviet/recipes/herringbone_bamboo_planks_stairs_from_herringbone_bamboo_planks_stonecutting.json new file mode 100644 index 0000000..de21eba --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/herringbone_bamboo_planks_stairs_from_herringbone_bamboo_planks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:herringbone_bamboo_planks" + }, + "result": "new_soviet:herringbone_bamboo_planks_stairs" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/herringbone_cherry_planks_slab.json b/src/main/generated/data/new_soviet/recipes/herringbone_cherry_planks_slab.json new file mode 100644 index 0000000..7977053 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/herringbone_cherry_planks_slab.json @@ -0,0 +1,17 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "new_soviet:herringbone_cherry_planks" + } + }, + "pattern": [ + "###" + ], + "result": { + "count": 6, + "item": "new_soviet:herringbone_cherry_planks_slab" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/herringbone_cherry_planks_slab_from_herringbone_cherry_planks_stonecutting.json b/src/main/generated/data/new_soviet/recipes/herringbone_cherry_planks_slab_from_herringbone_cherry_planks_stonecutting.json new file mode 100644 index 0000000..4b13b14 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/herringbone_cherry_planks_slab_from_herringbone_cherry_planks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:herringbone_cherry_planks" + }, + "result": "new_soviet:herringbone_cherry_planks_slab" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/herringbone_cherry_planks_stairs.json b/src/main/generated/data/new_soviet/recipes/herringbone_cherry_planks_stairs.json new file mode 100644 index 0000000..a9c5d2e --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/herringbone_cherry_planks_stairs.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "new_soviet:herringbone_cherry_planks" + } + }, + "pattern": [ + "# ", + "## ", + "###" + ], + "result": { + "count": 4, + "item": "new_soviet:herringbone_cherry_planks_stairs" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/herringbone_cherry_planks_stairs_from_herringbone_cherry_planks_stonecutting.json b/src/main/generated/data/new_soviet/recipes/herringbone_cherry_planks_stairs_from_herringbone_cherry_planks_stonecutting.json new file mode 100644 index 0000000..98dc1ab --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/herringbone_cherry_planks_stairs_from_herringbone_cherry_planks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:herringbone_cherry_planks" + }, + "result": "new_soviet:herringbone_cherry_planks_stairs" +} \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/blocks/TVBlock.java b/src/main/java/su/a71/new_soviet/blocks/TVBlock.java index 391dfe0..51c7bcd 100644 --- a/src/main/java/su/a71/new_soviet/blocks/TVBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/TVBlock.java @@ -141,7 +141,10 @@ public class TVBlock extends HorizontalFacingBlock implements BlockEntityProvide } static { - SHAPE = new Shapes.HorizontalShapeLegacy(List.of(List.of(0.0, 0.0, 2.0, 16.0, 13.0, 13.0), List.of(6.0, 13.0, 7.0, 10.0, 13.5, 9.0))); + SHAPE = new Shapes.HorizontalShapeLegacy(List.of( + List.of(0.0, 0.0, 2.0, 16.0, 13.0, 13.0), + List.of(6.0, 13.0, 7.0, 10.0, 13.5, 9.0), + List.of(3.0, 2.0, 13.0, 13.0, 9.0, 15.0))); ON = RedstoneTorchBlock.LIT; WATERLOGGED = Properties.WATERLOGGED; BROKEN = Properties.CRACKED; 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 634bca7..af10421 100644 --- a/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java +++ b/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java @@ -210,6 +210,9 @@ public class BlockLootTables extends FabricBlockLootTableProvider { addDrop(NSE_Blocks.YELLOW_BOUNDARY_MARKER); addDrop(NSE_Blocks.RED_BOUNDARY_MARKER); addDrop(NSE_Blocks.ORANGE_BOUNDARY_MARKER); + addDrop(NSE_Blocks.CROSS_CHERRY_PLANKS); + addDrop(NSE_Blocks.HERRINGBONE_CHERRY_PLANKS); + addDrop(NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS); // Drops for furniture/electronics/appliances addDrop(NSE_Custom.WHITE_PAWN); @@ -441,6 +444,12 @@ public class BlockLootTables extends FabricBlockLootTableProvider { addDrop(NSE_Blocks.CYAN_LINOLEUM_STAIRS); addDrop(NSE_Blocks.METAL_PLATING_SLAB); addDrop(NSE_Blocks.METAL_PLATING_STAIRS); + addDrop(NSE_Blocks.HERRINGBONE_CHERRY_PLANKS_SLAB); + addDrop(NSE_Blocks.CROSS_CHERRY_PLANKS_STAIRS); + addDrop(NSE_Blocks.CROSS_CHERRY_PLANKS_SLAB); + addDrop(NSE_Blocks.HERRINGBONE_CHERRY_PLANKS_STAIRS); + addDrop(NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS_SLAB); + addDrop(NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS_STAIRS); addDrop(NSE_Blocks.BARBED_WIRE, dropSilkAndNot(Items.IRON_NUGGET, NSE_Blocks.BARBED_WIRE)); addDrop(NSE_Blocks.DIRT_ROAD, dropSilkAndNot(Blocks.DIRT, NSE_Blocks.DIRT_ROAD)); 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 c2050c7..2768411 100644 --- a/src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java +++ b/src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java @@ -401,7 +401,16 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider { .add(NSE_Blocks.BROWN_LINOLEUM_SLAB) .add(NSE_Blocks.CYAN_LINOLEUM_STAIRS) .add(NSE_Blocks.CYAN_LINOLEUM_SLAB) - .add(NSE_Custom.TABLE_LAMP); + .add(NSE_Custom.TABLE_LAMP) + .add(NSE_Blocks.CROSS_CHERRY_PLANKS) + .add(NSE_Blocks.CROSS_CHERRY_PLANKS_STAIRS) + .add(NSE_Blocks.CROSS_CHERRY_PLANKS_SLAB) + .add(NSE_Blocks.HERRINGBONE_CHERRY_PLANKS_STAIRS) + .add(NSE_Blocks.HERRINGBONE_CHERRY_PLANKS_SLAB) + .add(NSE_Blocks.HERRINGBONE_CHERRY_PLANKS) + .add(NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS_STAIRS) + .add(NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS_SLAB) + .add(NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS); getOrCreateTagBuilder(NSE_Tags.Blocks.RAKE_MINEABLE) .add(NSE_Blocks.MEAT) @@ -456,7 +465,10 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider { .add(NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS) .add(NSE_Blocks.CROSS_MANGROVE_PLANKS) .add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS) - .add(NSE_Blocks.CROSS_SPRUCE_PLANKS); + .add(NSE_Blocks.CROSS_SPRUCE_PLANKS) + .add(NSE_Blocks.CROSS_CHERRY_PLANKS) + .add(NSE_Blocks.HERRINGBONE_CHERRY_PLANKS) + .add(NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS); getOrCreateTagBuilder(BlockTags.STAIRS) .add(NSE_Blocks.SAND_TILES_STAIRS) @@ -560,7 +572,10 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider { .add(NSE_Blocks.ORANGE_LINOLEUM_STAIRS) .add(NSE_Blocks.BROWN_LINOLEUM_STAIRS) .add(NSE_Blocks.CYAN_LINOLEUM_STAIRS) - .add(NSE_Blocks.METAL_PLATING_STAIRS); + .add(NSE_Blocks.METAL_PLATING_STAIRS) + .add(NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS_STAIRS) + .add(NSE_Blocks.CROSS_CHERRY_PLANKS_STAIRS) + .add(NSE_Blocks.HERRINGBONE_CHERRY_PLANKS_STAIRS); getOrCreateTagBuilder(BlockTags.SLABS) .add(NSE_Blocks.SAND_TILES_SLAB) @@ -664,7 +679,10 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider { .add(NSE_Blocks.ORANGE_LINOLEUM_SLAB) .add(NSE_Blocks.BROWN_LINOLEUM_SLAB) .add(NSE_Blocks.CYAN_LINOLEUM_SLAB) - .add(NSE_Blocks.METAL_PLATING_SLAB); + .add(NSE_Blocks.METAL_PLATING_SLAB) + .add(NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS_SLAB) + .add(NSE_Blocks.CROSS_CHERRY_PLANKS_SLAB) + .add(NSE_Blocks.HERRINGBONE_CHERRY_PLANKS_SLAB); getOrCreateTagBuilder(BlockTags.WOODEN_STAIRS) .add(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_STAIRS) @@ -682,7 +700,10 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider { .add(NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS_STAIRS) .add(NSE_Blocks.CROSS_MANGROVE_PLANKS_STAIRS) .add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_STAIRS) - .add(NSE_Blocks.CROSS_SPRUCE_PLANKS_STAIRS); + .add(NSE_Blocks.CROSS_SPRUCE_PLANKS_STAIRS) + .add(NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS_STAIRS) + .add(NSE_Blocks.CROSS_CHERRY_PLANKS_STAIRS) + .add(NSE_Blocks.HERRINGBONE_CHERRY_PLANKS_STAIRS); getOrCreateTagBuilder(BlockTags.WOODEN_SLABS) .add(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_SLAB) @@ -700,7 +721,10 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider { .add(NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS_SLAB) .add(NSE_Blocks.CROSS_MANGROVE_PLANKS_SLAB) .add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_SLAB) - .add(NSE_Blocks.CROSS_SPRUCE_PLANKS_SLAB); + .add(NSE_Blocks.CROSS_SPRUCE_PLANKS_SLAB) + .add(NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS_SLAB) + .add(NSE_Blocks.CROSS_CHERRY_PLANKS_SLAB) + .add(NSE_Blocks.HERRINGBONE_CHERRY_PLANKS_SLAB); getOrCreateTagBuilder(NSE_Tags.Blocks.BOUNDARY_MARKERS) .add(NSE_Blocks.BLUE_BOUNDARY_MARKER) 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 f976212..10e7756 100644 --- a/src/main/java/su/a71/new_soviet/datagen/ModelGenerator.java +++ b/src/main/java/su/a71/new_soviet/datagen/ModelGenerator.java @@ -201,6 +201,10 @@ public class ModelGenerator extends FabricModelProvider { registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.CROSS_MANGROVE_PLANKS, NSE_Blocks.CROSS_MANGROVE_PLANKS_STAIRS, NSE_Blocks.CROSS_MANGROVE_PLANKS_SLAB, "floor/planks"); registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS, NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_SLAB, "floor/planks"); registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.CROSS_SPRUCE_PLANKS, NSE_Blocks.CROSS_SPRUCE_PLANKS_STAIRS, NSE_Blocks.CROSS_SPRUCE_PLANKS_SLAB, "floor/planks"); + registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.HERRINGBONE_CHERRY_PLANKS, NSE_Blocks.HERRINGBONE_CHERRY_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_CHERRY_PLANKS_SLAB, "floor/planks"); + 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.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"); 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 560f925..a6debad 100644 --- a/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java +++ b/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java @@ -718,6 +718,9 @@ public class RecipeGenerator extends FabricRecipeProvider { offerStairsAndSlab(exporter, NSE_Blocks.BROWN_LINOLEUM_STAIRS, NSE_Blocks.BROWN_LINOLEUM_SLAB, NSE_Blocks.BROWN_LINOLEUM); offerStairsAndSlab(exporter, NSE_Blocks.CYAN_LINOLEUM_STAIRS, NSE_Blocks.CYAN_LINOLEUM_SLAB, NSE_Blocks.CYAN_LINOLEUM); offerStairsAndSlab(exporter, NSE_Blocks.METAL_PLATING_STAIRS, NSE_Blocks.METAL_PLATING_SLAB, NSE_Blocks.METAL_PLATING); + offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_CHERRY_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_CHERRY_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_CHERRY_PLANKS); + offerStairsAndSlab(exporter, NSE_Blocks.CROSS_CHERRY_PLANKS_STAIRS, NSE_Blocks.CROSS_CHERRY_PLANKS_SLAB, NSE_Blocks.CROSS_CHERRY_PLANKS); + offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS); offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.WHITE_BOUNDARY_MARKER, Blocks.DIORITE_WALL, 1); offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.WHITE_BOUNDARY_MARKER, Blocks.BONE_BLOCK, 2); 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 cd1f230..c480d85 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 @@ -363,6 +363,15 @@ public class NSE_Blocks extends NSE_BaseRegistration { public static final Block CROSS_SPRUCE_PLANKS = new Block(FabricBlockSettings.copy(Blocks.SPRUCE_PLANKS)); public static final StairsBlock CROSS_SPRUCE_PLANKS_STAIRS = new StairsBlock(CROSS_SPRUCE_PLANKS.getDefaultState(), FabricBlockSettings.copy(CROSS_SPRUCE_PLANKS)); public static final SlabBlock CROSS_SPRUCE_PLANKS_SLAB = new SlabBlock(FabricBlockSettings.copy(CROSS_SPRUCE_PLANKS)); + public static final Block HERRINGBONE_CHERRY_PLANKS = new Block(FabricBlockSettings.copy(Blocks.CHERRY_PLANKS)); + public static final StairsBlock HERRINGBONE_CHERRY_PLANKS_STAIRS = new StairsBlock(HERRINGBONE_CHERRY_PLANKS.getDefaultState(), FabricBlockSettings.copy(HERRINGBONE_SPRUCE_PLANKS)); + public static final SlabBlock HERRINGBONE_CHERRY_PLANKS_SLAB = new SlabBlock(FabricBlockSettings.copy(HERRINGBONE_CHERRY_PLANKS)); + public static final Block CROSS_CHERRY_PLANKS = new Block(FabricBlockSettings.copy(Blocks.CHERRY_PLANKS)); + public static final StairsBlock CROSS_CHERRY_PLANKS_STAIRS = new StairsBlock(CROSS_CHERRY_PLANKS.getDefaultState(), FabricBlockSettings.copy(CROSS_CHERRY_PLANKS)); + public static final SlabBlock CROSS_CHERRY_PLANKS_SLAB = new SlabBlock(FabricBlockSettings.copy(CROSS_CHERRY_PLANKS)); + public static final Block HERRINGBONE_BAMBOO_PLANKS = new Block(FabricBlockSettings.copy(Blocks.BAMBOO_PLANKS)); + 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)); @@ -815,7 +824,15 @@ public class NSE_Blocks extends NSE_BaseRegistration { registerBlock("cross_spruce_planks", () -> CROSS_SPRUCE_PLANKS, NSE_BUILDING_TAB); registerBlock("cross_spruce_planks_stairs", () -> CROSS_SPRUCE_PLANKS_STAIRS, NSE_BUILDING_TAB); registerBlock("cross_spruce_planks_slab", () -> CROSS_SPRUCE_PLANKS_SLAB, NSE_BUILDING_TAB); - // TODO: Cherry!!! + registerBlock("herringbone_cherry_planks", () -> HERRINGBONE_CHERRY_PLANKS, NSE_BUILDING_TAB); + registerBlock("herringbone_cherry_planks_stairs", () -> HERRINGBONE_CHERRY_PLANKS_STAIRS, NSE_BUILDING_TAB); + registerBlock("herringbone_cherry_planks_slab", () -> HERRINGBONE_CHERRY_PLANKS_SLAB, NSE_BUILDING_TAB); + registerBlock("cross_cherry_planks", () -> CROSS_CHERRY_PLANKS, NSE_BUILDING_TAB); + registerBlock("cross_cherry_planks_stairs", () -> CROSS_CHERRY_PLANKS_STAIRS, NSE_BUILDING_TAB); + registerBlock("cross_cherry_planks_slab", () -> CROSS_CHERRY_PLANKS_SLAB, NSE_BUILDING_TAB); + registerBlock("herringbone_bamboo_planks", () -> HERRINGBONE_BAMBOO_PLANKS, NSE_BUILDING_TAB); + 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); @@ -930,6 +947,9 @@ public class NSE_Blocks extends NSE_BaseRegistration { flammableBlockRegistry.add(CROSS_MANGROVE_PLANKS, 20, 5); flammableBlockRegistry.add(HERRINGBONE_SPRUCE_PLANKS, 20, 5); flammableBlockRegistry.add(CROSS_SPRUCE_PLANKS, 20, 5); + flammableBlockRegistry.add(HERRINGBONE_CHERRY_PLANKS, 20, 5); + flammableBlockRegistry.add(CROSS_CHERRY_PLANKS, 20, 5); + flammableBlockRegistry.add(HERRINGBONE_BAMBOO_PLANKS, 20, 5); flammableBlockRegistry.add(HERRINGBONE_PARQUET, 20, 5); flammableBlockRegistry.add(STRAIGHT_PARQUET, 20, 5); @@ -973,12 +993,20 @@ public class NSE_Blocks extends NSE_BaseRegistration { flammableBlockRegistry.add(HERRINGBONE_SPRUCE_PLANKS_SLAB, 20, 5); flammableBlockRegistry.add(CROSS_SPRUCE_PLANKS_STAIRS, 20, 5); flammableBlockRegistry.add(CROSS_SPRUCE_PLANKS_SLAB, 20, 5); + flammableBlockRegistry.add(HERRINGBONE_CHERRY_PLANKS, 20, 5); + flammableBlockRegistry.add(HERRINGBONE_CHERRY_PLANKS, 20, 5); + flammableBlockRegistry.add(CROSS_CHERRY_PLANKS, 20, 5); + flammableBlockRegistry.add(CROSS_CHERRY_PLANKS, 20, 5); + 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(STRAIGHT_PARQUET_STAIRS, 20, 5); flammableBlockRegistry.add(STRAIGHT_PARQUET_SLAB, 20, 5); flammableBlockRegistry.add(SEPARATED_PARQUET_STAIRS, 20, 5); flammableBlockRegistry.add(SEPARATED_PARQUET_SLAB, 20, 5); + flammableBlockRegistry.add(GREEN_LINOLEUM_STAIRS, 20, 5); flammableBlockRegistry.add(GREEN_LINOLEUM_SLAB, 20, 5); flammableBlockRegistry.add(BLUE_LINOLEUM_STAIRS, 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 2a8ca21..5293b4f 100644 --- a/src/main/resources/assets/new_soviet/lang/en_us.json +++ b/src/main/resources/assets/new_soviet/lang/en_us.json @@ -468,6 +468,15 @@ "block.new_soviet.cyan_boundary_marker": "Cyan Boundary Marker", "block.new_soviet.barbed_wire": "Barbed Wire", "block.new_soviet.dirt_road": "Dirt Road", + "block.new_soviet.cross_cherry_planks": "Cross Cherry Planks", + "block.new_soviet.cross_cherry_planks_stairs": "Cross Cherry Planks Stairs", + "block.new_soviet.cross_cherry_planks_slab": "Cross Cherry Planks Slab", + "block.new_soviet.herringbone_cherry_planks": "Herringbone Cherry Planks", + "block.new_soviet.herringbone_cherry_planks_stairs": "Herringbone Cherry Planks Stairs", + "block.new_soviet.herringbone_cherry_planks_slab": "Herringbone Cherry Slab", + "block.new_soviet.herringbone_bamboo_planks": "Herringbone Bamboo Planks", + "block.new_soviet.herringbone_bamboo_planks_stairs": "Herringbone Bamboo Planks Stairs", + "block.new_soviet.herringbone_bamboo_planks_slab": "Herringbone Bamboo Planks Slab", "advancement.new_soviet.root.name": "A New Era", "advancement.new_soviet.root.desc": "Time to create something great", diff --git a/src/main/resources/assets/new_soviet/textures/block/floor/planks/cross_cherry_planks.png b/src/main/resources/assets/new_soviet/textures/block/floor/planks/cross_cherry_planks.png new file mode 100644 index 0000000000000000000000000000000000000000..be1b4f4ba4309830885907dd378ed4b8a9a3b690 GIT binary patch literal 777 zcmV+k1NQuhP)EX>4Tx04R}tkv&MmKpe$iQ?()$1q+HeWT;LSM2k2|6^me@v=v%)FuAm~(4-+r zad8w}3l4rPRvlcNb#-tR1i=pwM<*vm7b)?7NufoI2gm(*ckglc4iM^PrkWiSfT~$W zDjpNFxfL<+iY^2(h<-#RX6lLbLI$4W>mEM7-bHwp_qjhuuaY+z;1h{wnQmCb>%`NW zmd<&fIK(z2h4`F!+@K2*KXP4m`HgeYVS#6cj7(~dI7BQK+gNU6wqdBmQR1+oYLqWz zT~;`6aaPM!*1RWwVKA>Pr@2mZ1aT}Pfh0u8sG@{2EJSG4NHLM3{g{V;*zqUHC6lWJ zMvi$@ph9x|;D7MDTeC1V=_UnZKKS@MER5*==lh0}bF%ZUog`wRBj1}=D z;-!862k5P@p|?duRAjS|W=o(wWD}Ehm(FP?O!Ce5XP=H=pTATJoW&o`$WlY~0)W}= z(I4+nDT;CyAk0%KgZL$Xd zrRHJ4b!kmg*Wo<7l$XRooDCGJEplt|J(AvR3RKN1ZDZ;>XaH?MErjY4a?s(il$zf+ zknf+gN#q?x^^4i46ZUdK{Naqrc=^M*;A!f56gkd_tXJr2TMXzZV4eeKL*HwnSz&g2 zWYXtYSx%B0c}|kgk)yK@e#eJW(6SPLHCWpeyrya_Cn8IYUI%ZJ$NifAYWOcF0@FSl z+Z4ems?UkQAn&;rm(!i=Femi?g1?&7B%WD6%!%3U3%&jT!HLIe1U5VM00000NkvXX Hu0mjfV_{#a literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/new_soviet/textures/block/floor/planks/herringbone_bamboo_planks.png b/src/main/resources/assets/new_soviet/textures/block/floor/planks/herringbone_bamboo_planks.png new file mode 100644 index 0000000000000000000000000000000000000000..33cd66b48debe67e6fbbe404c7853389609fbac3 GIT binary patch literal 924 zcmV;N17rM&P)EX>4Tx04R}tkv&MmKpe$iQ?()$1q+HeWT;LSM2k2|6^me@v=v%)FuAm~(4-+r zad8w}3l4rPRvlcNb#-tR1i=pwM<*vm7b)?7NufoI2gm(*ckglc4iM^PrkWiSfT~$W zDjpNFxfL<+iY^2(h<-#RX6lLbLI$4W>mEM7-bHwp_qjhuuaY+z;1h{wnQmCb>%`NW zmd<&fIK(z2h4`F!+@K2*KXP4m`HgeYVS#6cj7(~dI7BQK+gNU6wqdBmQR1+oYLqWz zT~;`6aaPM!*1RWwVKA>Pr@2mZ1aT}Pfh0u8sG@{2EJSG4NHLM3{g{V;*zqUHC6lWJ zMvi$@ph9x|;D7MDTeC1V=_UnZK(n&-?R5*=wlfiG=Fc`&u2sbWHK=pd) zv@)blt<<%L?y~=4f9U>)9d_EKm#PQ4Nnx8rp%*Gi~d2cd&uv494R}LenI3i3f@Zl5Gl_hh#3P^r06SK;1vg{eAvbaX%rh z^zBx|e`_6}a-ZKKBHZ3Rb8+24ZJU3AXUiSme~9BWc(bNGGY@lkMm+S3TR12CaX_hv{{p7!TK%Ns_(M`>kJ5EpYq-h<{J3pj* zq`l7<*BwH0;15`&>sn6KrnxN^^3evW&|m`KHL2>6D-3b}XRg6io@#Hwn8*iZGEX>4Tx04R}tkv&MmKpe$iQ?()$1q+HeWT;LSM2k2|6^me@v=v%)FuAm~(4-+r zad8w}3l4rPRvlcNb#-tR1i=pwM<*vm7b)?7NufoI2gm(*ckglc4iM^PrkWiSfT~$W zDjpNFxfL<+iY^2(h<-#RX6lLbLI$4W>mEM7-bHwp_qjhuuaY+z;1h{wnQmCb>%`NW zmd<&fIK(z2h4`F!+@K2*KXP4m`HgeYVS#6cj7(~dI7BQK+gNU6wqdBmQR1+oYLqWz zT~;`6aaPM!*1RWwVKA>Pr@2mZ1aT}Pfh0u8sG@{2EJSG4NHLM3{g{V;*zqUHC6lWJ zMvi$@ph9x|;D7MDTeC1V=_UnZKUP(kjR5*>5lfiDnFc3svs}%{BNI+Fi z5x4gLKcKh%2Ha4EqC!KAWNc)qJvcTAq=)XsvOQkUjK@#=kM|#}gFM53ejzUfvHVdZ zb%nHN0Iab{T|urA<~eR+9maI9Tp^b$K$zc`b#Q8teS_>9o`G}#fK&T;2=J>#Xqabd z?&mY)`_Q0Ni8(X?=-qCzK`g!527J#>iuD@ujDqTcsz2(72F2SeSVvJ;=*<=Zl1UG= z<2avzbtqLru8{VO@1;o8gLMJjZ(tqf&`{Xhs~FRfW<6f~QBS)aHUH&Fo}pBUNL?lU zdb1502R9^E)`e!)jQR+8U$Iq66ALaFk$7$ppW#&n}3rrQVmk*!>=XwxByQV;xh z4q`VSCDax1ZzNBwgXL7kqehz! m`oB<6rQ}7;Fn)nyZhirqG`&SB=XHMo0000