From c7268d52a2245c926a1aedcb6f026b257ef7afcc Mon Sep 17 00:00:00 2001 From: Andrew-71 Date: Mon, 26 Jun 2023 20:19:23 +0300 Subject: [PATCH] We need to build a wall --- .../java/su/a71/new_soviet/NSE_Blocks.java | 31 ++++-- .../new_soviet/blockstates/concrete_wall.json | 90 ++++++++++++++++++ .../cracked_green_white_tiles.json | 7 ++ .../blockstates/cracked_teal_tiles.json | 7 ++ .../blockstates/green_white_tiles.json | 7 ++ .../blockstates/mossy_green_white_tiles.json | 7 ++ .../blockstates/mossy_teal_tiles.json | 7 ++ .../blockstates/separated_parquet.json | 7 ++ .../blockstates/small_cracked_teal_tiles.json | 7 ++ .../blockstates/small_teal_tiles.json | 7 ++ .../blockstates/straight_parquet.json | 7 ++ .../new_soviet/blockstates/teal_tiles.json | 7 ++ .../models/block/concrete_wall_inventory.json | 6 ++ .../models/block/concrete_wall_post.json | 6 ++ .../models/block/concrete_wall_side.json | 6 ++ .../models/block/concrete_wall_side_tall.json | 6 ++ .../block/cracked_green_white_tiles.json | 8 ++ .../models/block/cracked_teal_tiles.json | 8 ++ .../models/block/green_white_tiles.json | 8 ++ .../models/block/mossy_green_white_tiles.json | 8 ++ .../models/block/mossy_teal_tiles.json | 9 ++ .../models/block/separated_parquet.json | 9 ++ .../block/small_cracked_teal_tiles.json | 9 ++ .../models/block/small_teal_tiles.json | 9 ++ .../models/block/straight_parquet.json | 9 ++ .../new_soviet/models/block/teal_tiles.json | 9 ++ .../new_soviet/models/item/concrete_wall.json | 3 + .../item/cracked_green_white_tiles.json | 4 + .../models/item/cracked_teal_tiles.json | 4 + .../models/item/green_white_tiles.json | 4 + .../models/item/mossy_green_white_tiles.json | 4 + .../models/item/mossy_teal_tiles.json | 4 + .../models/item/separated_parquet.json | 4 + .../models/item/small_cracked_teal_tiles.json | 4 + .../models/item/small_teal_tiles.json | 4 + .../models/item/straight_parquet.json | 4 + .../new_soviet/models/item/teal_tiles.json | 4 + ...ne_parquet.png => herringbone_parquet.png} | Bin ...el3c.png => cracked_green_white_tiles.png} | Bin .../{kafel3.png => green_white_tiles.png} | Bin ...afel3b.png => mossy_green_white_tiles.png} | Bin .../concrete_wall.png} | Bin .../data/minecraft/tags/blocks/walls.json | 5 + 43 files changed, 339 insertions(+), 10 deletions(-) create mode 100644 src/main/resources/assets/new_soviet/blockstates/concrete_wall.json create mode 100644 src/main/resources/assets/new_soviet/blockstates/cracked_green_white_tiles.json create mode 100644 src/main/resources/assets/new_soviet/blockstates/cracked_teal_tiles.json create mode 100644 src/main/resources/assets/new_soviet/blockstates/green_white_tiles.json create mode 100644 src/main/resources/assets/new_soviet/blockstates/mossy_green_white_tiles.json create mode 100644 src/main/resources/assets/new_soviet/blockstates/mossy_teal_tiles.json create mode 100644 src/main/resources/assets/new_soviet/blockstates/separated_parquet.json create mode 100644 src/main/resources/assets/new_soviet/blockstates/small_cracked_teal_tiles.json create mode 100644 src/main/resources/assets/new_soviet/blockstates/small_teal_tiles.json create mode 100644 src/main/resources/assets/new_soviet/blockstates/straight_parquet.json create mode 100644 src/main/resources/assets/new_soviet/blockstates/teal_tiles.json create mode 100644 src/main/resources/assets/new_soviet/models/block/concrete_wall_inventory.json create mode 100644 src/main/resources/assets/new_soviet/models/block/concrete_wall_post.json create mode 100644 src/main/resources/assets/new_soviet/models/block/concrete_wall_side.json create mode 100644 src/main/resources/assets/new_soviet/models/block/concrete_wall_side_tall.json create mode 100644 src/main/resources/assets/new_soviet/models/block/cracked_green_white_tiles.json create mode 100644 src/main/resources/assets/new_soviet/models/block/cracked_teal_tiles.json create mode 100644 src/main/resources/assets/new_soviet/models/block/green_white_tiles.json create mode 100644 src/main/resources/assets/new_soviet/models/block/mossy_green_white_tiles.json create mode 100644 src/main/resources/assets/new_soviet/models/block/mossy_teal_tiles.json create mode 100644 src/main/resources/assets/new_soviet/models/block/separated_parquet.json create mode 100644 src/main/resources/assets/new_soviet/models/block/small_cracked_teal_tiles.json create mode 100644 src/main/resources/assets/new_soviet/models/block/small_teal_tiles.json create mode 100644 src/main/resources/assets/new_soviet/models/block/straight_parquet.json create mode 100644 src/main/resources/assets/new_soviet/models/block/teal_tiles.json create mode 100644 src/main/resources/assets/new_soviet/models/item/concrete_wall.json create mode 100644 src/main/resources/assets/new_soviet/models/item/cracked_green_white_tiles.json create mode 100644 src/main/resources/assets/new_soviet/models/item/cracked_teal_tiles.json create mode 100644 src/main/resources/assets/new_soviet/models/item/green_white_tiles.json create mode 100644 src/main/resources/assets/new_soviet/models/item/mossy_green_white_tiles.json create mode 100644 src/main/resources/assets/new_soviet/models/item/mossy_teal_tiles.json create mode 100644 src/main/resources/assets/new_soviet/models/item/separated_parquet.json create mode 100644 src/main/resources/assets/new_soviet/models/item/small_cracked_teal_tiles.json create mode 100644 src/main/resources/assets/new_soviet/models/item/small_teal_tiles.json create mode 100644 src/main/resources/assets/new_soviet/models/item/straight_parquet.json create mode 100644 src/main/resources/assets/new_soviet/models/item/teal_tiles.json rename src/main/resources/assets/new_soviet/textures/block/floor/planks/{small_herringbone_parquet.png => herringbone_parquet.png} (100%) rename src/main/resources/assets/new_soviet/textures/block/green_white/{kafel3c.png => cracked_green_white_tiles.png} (100%) rename src/main/resources/assets/new_soviet/textures/block/green_white/{kafel3.png => green_white_tiles.png} (100%) rename src/main/resources/assets/new_soviet/textures/block/green_white/{kafel3b.png => mossy_green_white_tiles.png} (100%) rename src/main/resources/assets/new_soviet/textures/block/{concrete_fence.png => industrial/concrete_wall.png} (100%) create mode 100644 src/main/resources/data/minecraft/tags/blocks/walls.json diff --git a/src/main/java/su/a71/new_soviet/NSE_Blocks.java b/src/main/java/su/a71/new_soviet/NSE_Blocks.java index 962b570..7ac6cf3 100644 --- a/src/main/java/su/a71/new_soviet/NSE_Blocks.java +++ b/src/main/java/su/a71/new_soviet/NSE_Blocks.java @@ -5,12 +5,14 @@ import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup; import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.Block; +import net.minecraft.block.WallBlock; import net.minecraft.item.BlockItem; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.tag.BlockTags; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.text.Text; import net.minecraft.util.Identifier; @@ -86,6 +88,11 @@ public class NSE_Blocks { public static final Block BIG_GRANITE_TILES = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE)); public static final Block SMALL_GRANITE_TILES = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE)); + public static final Block GREEN_WHITE_TILES = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE)); + public static final Block CRACKED_GREEN_WHITE_TILES = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE)); + public static final Block MOSSY_GREEN_WHITE_TILES = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE)); + + // TODO: There are far more of these public static final Block SMOOTH_TUFF_TILES = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.TUFF)); // Industrial ===================================== @@ -93,6 +100,7 @@ public class NSE_Blocks { public static final Block RED_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL)); public static final Block ORANGE_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL)); public static final Block METAL_PLATING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL)); + public static final WallBlock CONCRETE_WALL = new WallBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE)); // WOOD/FLOOR ====== public static final Block HERRINGBONE_ACACIA_PLANKS = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD)); @@ -117,15 +125,15 @@ public class NSE_Blocks { public static final Block SEPARATED_PARQUET = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD)); //TODO: Wool or wood? - public static final Block GREEN_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOL)); - public static final Block BLUE_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOL)); - public static final Block RED_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOL)); - public static final Block GRAY_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOL)); - public static final Block ORANGE_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOL)); - public static final Block BROWN_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOL)); - public static final Block CYAN_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOL)); - public static final Block CROSS_ORANGE_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOL)); - public static final Block CROSS_BROWN_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOL)); + public static final Block GREEN_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD)); + public static final Block BLUE_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD)); + public static final Block RED_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD)); + public static final Block GRAY_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD)); + public static final Block ORANGE_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD)); + public static final Block BROWN_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD)); + public static final Block CYAN_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD)); + public static final Block CROSS_ORANGE_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD)); + public static final Block CROSS_BROWN_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD)); // Concrete //RED_CONCRETE @@ -229,13 +237,16 @@ public class NSE_Blocks { register("mossy_light_blue_bricks", () -> MOSSY_LIGHT_BLUE_BRICKS, NSE_TAB); register("big_granite_tiles", () -> BIG_GRANITE_TILES, NSE_TAB); register("small_granite_tiles", () -> SMALL_GRANITE_TILES, NSE_TAB); + register("green_white_tiles", () -> GREEN_WHITE_TILES, NSE_TAB); + register("cracked_green_white_tiles", () -> CRACKED_GREEN_WHITE_TILES, NSE_TAB); + register("mossy_green_white_tiles", () -> MOSSY_GREEN_WHITE_TILES, NSE_TAB); register("smooth_tuff_tiles", () -> SMOOTH_TUFF_TILES, NSE_TAB); register("industrial_warning", () -> INDUSTRIAL_WARNING, NSE_TAB); register("red_warning", () -> RED_WARNING, NSE_TAB); register("orange_warning", () -> ORANGE_WARNING, NSE_TAB); register("metal_plating", () -> METAL_PLATING, NSE_TAB); - + register("concrete_wall", () -> CONCRETE_WALL, NSE_TAB); // TODO: Broken register("herringbone_acacia_planks", () -> HERRINGBONE_ACACIA_PLANKS, NSE_TAB); register("cross_acacia_planks", () -> CROSS_ACACIA_PLANKS, NSE_TAB); diff --git a/src/main/resources/assets/new_soviet/blockstates/concrete_wall.json b/src/main/resources/assets/new_soviet/blockstates/concrete_wall.json new file mode 100644 index 0000000..fbc78c5 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/concrete_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "new_soviet:block/concrete_wall_post" + } + }, + { + "when": { + "north": "low" + }, + "apply": { + "model": "new_soviet:block/concrete_wall_side", + "uvlock": true + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "new_soviet:block/concrete_wall_side", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "low" + }, + "apply": { + "model": "new_soviet:block/concrete_wall_side", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "low" + }, + "apply": { + "model": "new_soviet:block/concrete_wall_side", + "y": 270, + "uvlock": true + } + }, + { + "when": { + "north": "tall" + }, + "apply": { + "model": "new_soviet:block/concrete_wall_side_tall", + "uvlock": true + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "new_soviet:block/concrete_wall_side_tall", + "y": 90, + "uvlock": true + } + }, + { + "when": { + "south": "tall" + }, + "apply": { + "model": "new_soviet:block/concrete_wall_side_tall", + "y": 180, + "uvlock": true + } + }, + { + "when": { + "west": "tall" + }, + "apply": { + "model": "new_soviet:block/concrete_wall_side_tall", + "y": 270, + "uvlock": true + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/cracked_green_white_tiles.json b/src/main/resources/assets/new_soviet/blockstates/cracked_green_white_tiles.json new file mode 100644 index 0000000..69b9327 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/cracked_green_white_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/cracked_green_white_tiles" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/cracked_teal_tiles.json b/src/main/resources/assets/new_soviet/blockstates/cracked_teal_tiles.json new file mode 100644 index 0000000..ef55ed7 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/cracked_teal_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/cracked_teal_tiles" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/green_white_tiles.json b/src/main/resources/assets/new_soviet/blockstates/green_white_tiles.json new file mode 100644 index 0000000..ed866ca --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/green_white_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/green_white_tiles" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/mossy_green_white_tiles.json b/src/main/resources/assets/new_soviet/blockstates/mossy_green_white_tiles.json new file mode 100644 index 0000000..55020cf --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/mossy_green_white_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/mossy_green_white_tiles" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/mossy_teal_tiles.json b/src/main/resources/assets/new_soviet/blockstates/mossy_teal_tiles.json new file mode 100644 index 0000000..af7f0f5 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/mossy_teal_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/mossy_teal_tiles" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/separated_parquet.json b/src/main/resources/assets/new_soviet/blockstates/separated_parquet.json new file mode 100644 index 0000000..f55b78b --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/separated_parquet.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/separated_parquet" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/small_cracked_teal_tiles.json b/src/main/resources/assets/new_soviet/blockstates/small_cracked_teal_tiles.json new file mode 100644 index 0000000..b665db3 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/small_cracked_teal_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/small_cracked_teal_tiles" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/small_teal_tiles.json b/src/main/resources/assets/new_soviet/blockstates/small_teal_tiles.json new file mode 100644 index 0000000..f489efb --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/small_teal_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/small_teal_tiles" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/straight_parquet.json b/src/main/resources/assets/new_soviet/blockstates/straight_parquet.json new file mode 100644 index 0000000..fd276ff --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/straight_parquet.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/straight_parquet" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/teal_tiles.json b/src/main/resources/assets/new_soviet/blockstates/teal_tiles.json new file mode 100644 index 0000000..3153276 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/teal_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/teal_tiles" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/concrete_wall_inventory.json b/src/main/resources/assets/new_soviet/models/block/concrete_wall_inventory.json new file mode 100644 index 0000000..cfb9013 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/concrete_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "new_soviet:block/industrial/concrete_wall" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/concrete_wall_post.json b/src/main/resources/assets/new_soviet/models/block/concrete_wall_post.json new file mode 100644 index 0000000..cacaa21 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/concrete_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "new_soviet:block/industrial/concrete_wall" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/concrete_wall_side.json b/src/main/resources/assets/new_soviet/models/block/concrete_wall_side.json new file mode 100644 index 0000000..e370d64 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/concrete_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "new_soviet:block/industrial/concrete_wall" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/concrete_wall_side_tall.json b/src/main/resources/assets/new_soviet/models/block/concrete_wall_side_tall.json new file mode 100644 index 0000000..52a3a45 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/concrete_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "new_soviet:block/industrial/concrete_wall" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/cracked_green_white_tiles.json b/src/main/resources/assets/new_soviet/models/block/cracked_green_white_tiles.json new file mode 100644 index 0000000..830129e --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/cracked_green_white_tiles.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/green_white/cracked_green_white_tiles", + "particle": "new_soviet:block/green_white/cracked_green_white_tiles" + + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/cracked_teal_tiles.json b/src/main/resources/assets/new_soviet/models/block/cracked_teal_tiles.json new file mode 100644 index 0000000..da1c2d2 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/cracked_teal_tiles.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/teal/cracked_teal_tiles", + "particle": "new_soviet:block/teal/cracked_teal_tiles" + + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/green_white_tiles.json b/src/main/resources/assets/new_soviet/models/block/green_white_tiles.json new file mode 100644 index 0000000..49ad735 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/green_white_tiles.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/green_white/green_white_tiles", + "particle": "new_soviet:block/green_white/green_white_tiles" + + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/mossy_green_white_tiles.json b/src/main/resources/assets/new_soviet/models/block/mossy_green_white_tiles.json new file mode 100644 index 0000000..f1b48d8 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/mossy_green_white_tiles.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/green_white/mossy_green_white_tiles", + "particle": "new_soviet:block/green_white/mossy_green_white_tiles" + + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/mossy_teal_tiles.json b/src/main/resources/assets/new_soviet/models/block/mossy_teal_tiles.json new file mode 100644 index 0000000..0807cda --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/mossy_teal_tiles.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/teal/mossy_teal_tiles", + "particle": "new_soviet:block/teal/mossy_teal_tiles" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/separated_parquet.json b/src/main/resources/assets/new_soviet/models/block/separated_parquet.json new file mode 100644 index 0000000..182813d --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/separated_parquet.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/floor/planks/separated_parquet", + "particle": "new_soviet:block/floor/planks/separated_parquet" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/small_cracked_teal_tiles.json b/src/main/resources/assets/new_soviet/models/block/small_cracked_teal_tiles.json new file mode 100644 index 0000000..dee3b22 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/small_cracked_teal_tiles.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/teal/small_cracked_teal_tiles", + "particle": "new_soviet:block/teal/small_cracked_teal_tiles" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/small_teal_tiles.json b/src/main/resources/assets/new_soviet/models/block/small_teal_tiles.json new file mode 100644 index 0000000..80c59fa --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/small_teal_tiles.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/teal/small_teal_tiles", + "particle": "new_soviet:block/teal/small_teal_tiles" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/straight_parquet.json b/src/main/resources/assets/new_soviet/models/block/straight_parquet.json new file mode 100644 index 0000000..85eeaa3 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/straight_parquet.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/floor/planks/straight_parquet", + "particle": "new_soviet:block/floor/planks/straight_parquet" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/teal_tiles.json b/src/main/resources/assets/new_soviet/models/block/teal_tiles.json new file mode 100644 index 0000000..fb500ca --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/teal_tiles.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/teal/teal_tiles", + "particle": "new_soviet:block/teal/teal_tiles" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/item/concrete_wall.json b/src/main/resources/assets/new_soviet/models/item/concrete_wall.json new file mode 100644 index 0000000..be50e74 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/concrete_wall.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/concrete_wall_inventory" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/cracked_green_white_tiles.json b/src/main/resources/assets/new_soviet/models/item/cracked_green_white_tiles.json new file mode 100644 index 0000000..9ee1e91 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/cracked_green_white_tiles.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/cracked_green_white_tiles" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/cracked_teal_tiles.json b/src/main/resources/assets/new_soviet/models/item/cracked_teal_tiles.json new file mode 100644 index 0000000..4a095a0 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/cracked_teal_tiles.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/cracked_teal_tiles" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/green_white_tiles.json b/src/main/resources/assets/new_soviet/models/item/green_white_tiles.json new file mode 100644 index 0000000..8884607 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/green_white_tiles.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/green_white_tiles" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/mossy_green_white_tiles.json b/src/main/resources/assets/new_soviet/models/item/mossy_green_white_tiles.json new file mode 100644 index 0000000..95b0b89 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/mossy_green_white_tiles.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/mossy_green_white_tiles" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/mossy_teal_tiles.json b/src/main/resources/assets/new_soviet/models/item/mossy_teal_tiles.json new file mode 100644 index 0000000..84a9623 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/mossy_teal_tiles.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/mossy_teal_tiles" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/separated_parquet.json b/src/main/resources/assets/new_soviet/models/item/separated_parquet.json new file mode 100644 index 0000000..5a0ec8c --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/separated_parquet.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/separated_parquet" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/small_cracked_teal_tiles.json b/src/main/resources/assets/new_soviet/models/item/small_cracked_teal_tiles.json new file mode 100644 index 0000000..4b25219 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/small_cracked_teal_tiles.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/small_cracked_teal_tiles" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/small_teal_tiles.json b/src/main/resources/assets/new_soviet/models/item/small_teal_tiles.json new file mode 100644 index 0000000..c29ae7a --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/small_teal_tiles.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/small_teal_tiles" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/straight_parquet.json b/src/main/resources/assets/new_soviet/models/item/straight_parquet.json new file mode 100644 index 0000000..dd92419 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/straight_parquet.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/straight_parquet" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/teal_tiles.json b/src/main/resources/assets/new_soviet/models/item/teal_tiles.json new file mode 100644 index 0000000..5b16eb8 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/teal_tiles.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/teal_tiles" +} + diff --git a/src/main/resources/assets/new_soviet/textures/block/floor/planks/small_herringbone_parquet.png b/src/main/resources/assets/new_soviet/textures/block/floor/planks/herringbone_parquet.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/floor/planks/small_herringbone_parquet.png rename to src/main/resources/assets/new_soviet/textures/block/floor/planks/herringbone_parquet.png diff --git a/src/main/resources/assets/new_soviet/textures/block/green_white/kafel3c.png b/src/main/resources/assets/new_soviet/textures/block/green_white/cracked_green_white_tiles.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/green_white/kafel3c.png rename to src/main/resources/assets/new_soviet/textures/block/green_white/cracked_green_white_tiles.png diff --git a/src/main/resources/assets/new_soviet/textures/block/green_white/kafel3.png b/src/main/resources/assets/new_soviet/textures/block/green_white/green_white_tiles.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/green_white/kafel3.png rename to src/main/resources/assets/new_soviet/textures/block/green_white/green_white_tiles.png diff --git a/src/main/resources/assets/new_soviet/textures/block/green_white/kafel3b.png b/src/main/resources/assets/new_soviet/textures/block/green_white/mossy_green_white_tiles.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/green_white/kafel3b.png rename to src/main/resources/assets/new_soviet/textures/block/green_white/mossy_green_white_tiles.png diff --git a/src/main/resources/assets/new_soviet/textures/block/concrete_fence.png b/src/main/resources/assets/new_soviet/textures/block/industrial/concrete_wall.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/concrete_fence.png rename to src/main/resources/assets/new_soviet/textures/block/industrial/concrete_wall.png diff --git a/src/main/resources/data/minecraft/tags/blocks/walls.json b/src/main/resources/data/minecraft/tags/blocks/walls.json new file mode 100644 index 0000000..866a41f --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/walls.json @@ -0,0 +1,5 @@ +{ + "values": [ + "new_soviet:concrete_wall" + ] +} \ No newline at end of file