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 7ac6cf3..360d078 100644 --- a/src/main/java/su/a71/new_soviet/NSE_Blocks.java +++ b/src/main/java/su/a71/new_soviet/NSE_Blocks.java @@ -124,7 +124,6 @@ public class NSE_Blocks { public static final Block STRAIGHT_PARQUET = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD)); 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.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)); diff --git a/src/main/resources/assets/new_soviet/blockstates/blue_linoleum.json b/src/main/resources/assets/new_soviet/blockstates/blue_linoleum.json new file mode 100644 index 0000000..b451e46 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/blue_linoleum.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/blue_linoleum" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/brown_linoleum.json b/src/main/resources/assets/new_soviet/blockstates/brown_linoleum.json new file mode 100644 index 0000000..7eeb7bc --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/brown_linoleum.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/brown_linoleum" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/cracked_glazed_teal_tiles.json b/src/main/resources/assets/new_soviet/blockstates/cracked_glazed_teal_tiles.json new file mode 100644 index 0000000..d13d1cc --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/cracked_glazed_teal_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/cracked_glazed_teal_tiles" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/cross_brown_linoleum.json b/src/main/resources/assets/new_soviet/blockstates/cross_brown_linoleum.json new file mode 100644 index 0000000..c8f8b25 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/cross_brown_linoleum.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/cross_brown_linoleum" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/cross_orange_linoleum.json b/src/main/resources/assets/new_soviet/blockstates/cross_orange_linoleum.json new file mode 100644 index 0000000..0e6f553 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/cross_orange_linoleum.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/cross_orange_linoleum" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/cyan_linoleum.json b/src/main/resources/assets/new_soviet/blockstates/cyan_linoleum.json new file mode 100644 index 0000000..bc415b7 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/cyan_linoleum.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/cyan_linoleum" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/glazed_teal_tiles.json b/src/main/resources/assets/new_soviet/blockstates/glazed_teal_tiles.json new file mode 100644 index 0000000..042f281 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/glazed_teal_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/glazed_teal_tiles" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/gray_linoleum.json b/src/main/resources/assets/new_soviet/blockstates/gray_linoleum.json new file mode 100644 index 0000000..ab67d21 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/gray_linoleum.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/gray_linoleum" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/green_linoleum.json b/src/main/resources/assets/new_soviet/blockstates/green_linoleum.json new file mode 100644 index 0000000..4aba45d --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/green_linoleum.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/green_linoleum" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/orange_linoleum.json b/src/main/resources/assets/new_soviet/blockstates/orange_linoleum.json new file mode 100644 index 0000000..6630812 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/orange_linoleum.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/orange_linoleum" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/red_linoleum.json b/src/main/resources/assets/new_soviet/blockstates/red_linoleum.json new file mode 100644 index 0000000..86302aa --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/red_linoleum.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/red_linoleum" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/variated_teal_tiles.json b/src/main/resources/assets/new_soviet/blockstates/variated_teal_tiles.json new file mode 100644 index 0000000..143280e --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/variated_teal_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/variated_teal_tiles" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/blue_linoleum.json b/src/main/resources/assets/new_soviet/models/block/blue_linoleum.json new file mode 100644 index 0000000..7eb44d3 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/blue_linoleum.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/floor/linoleum/blue_linoleum", + "particle": "new_soviet:block/floor/linoleum/blue_linoleum" + + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/brown_linoleum.json b/src/main/resources/assets/new_soviet/models/block/brown_linoleum.json new file mode 100644 index 0000000..a57a9a0 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/brown_linoleum.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/floor/linoleum/brown_linoleum", + "particle": "new_soviet:block/floor/linoleum/brown_linoleum" + + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/cracked_glazed_teal_tiles.json b/src/main/resources/assets/new_soviet/models/block/cracked_glazed_teal_tiles.json new file mode 100644 index 0000000..900b962 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/cracked_glazed_teal_tiles.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/teal/cracked_glazed_teal_tiles", + "particle": "new_soviet:block/teal/cracked_glazed_teal_tiles" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/cross_brown_linoleum.json b/src/main/resources/assets/new_soviet/models/block/cross_brown_linoleum.json new file mode 100644 index 0000000..0c86ac6 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/cross_brown_linoleum.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/floor/linoleum/cross_brown_linoleum", + "particle": "new_soviet:block/floor/linoleum/cross_brown_linoleum" + + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/cross_orange_linoleum.json b/src/main/resources/assets/new_soviet/models/block/cross_orange_linoleum.json new file mode 100644 index 0000000..3a9cd75 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/cross_orange_linoleum.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/floor/linoleum/cross_orange_linoleum", + "particle": "new_soviet:block/floor/linoleum/cross_orange_linoleum" + + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/cyan_linoleum.json b/src/main/resources/assets/new_soviet/models/block/cyan_linoleum.json new file mode 100644 index 0000000..520f2b4 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/cyan_linoleum.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/floor/linoleum/cyan_linoleum", + "particle": "new_soviet:block/floor/linoleum/cyan_linoleum" + + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/glazed_teal_tiles.json b/src/main/resources/assets/new_soviet/models/block/glazed_teal_tiles.json new file mode 100644 index 0000000..dd8414a --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/glazed_teal_tiles.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/teal/glazed_teal_tiles", + "particle": "new_soviet:block/teal/glazed_teal_tiles" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/gray_linoleum.json b/src/main/resources/assets/new_soviet/models/block/gray_linoleum.json new file mode 100644 index 0000000..4e0a48c --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/gray_linoleum.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/floor/linoleum/gray_linoleum", + "particle": "new_soviet:block/floor/linoleum/gray_linoleum" + + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/green_linoleum.json b/src/main/resources/assets/new_soviet/models/block/green_linoleum.json new file mode 100644 index 0000000..64631ff --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/green_linoleum.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/floor/linoleum/green_linoleum", + "particle": "new_soviet:block/floor/linoleum/green_linoleum" + + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/orange_linoleum.json b/src/main/resources/assets/new_soviet/models/block/orange_linoleum.json new file mode 100644 index 0000000..bc8c6bb --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/orange_linoleum.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/floor/linoleum/orange_linoleum", + "particle": "new_soviet:block/floor/linoleum/orange_linoleum" + + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/red_linoleum.json b/src/main/resources/assets/new_soviet/models/block/red_linoleum.json new file mode 100644 index 0000000..c4b4820 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/red_linoleum.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/floor/linoleum/red_linoleum", + "particle": "new_soviet:block/floor/linoleum/red_linoleum" + + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/variated_teal_tiles.json b/src/main/resources/assets/new_soviet/models/block/variated_teal_tiles.json new file mode 100644 index 0000000..66ad9ae --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/variated_teal_tiles.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/teal/variated_teal_tiles", + "particle": "new_soviet:block/teal/variated_teal_tiles" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/blue_linoleum.json b/src/main/resources/assets/new_soviet/models/blue_linoleum.json new file mode 100644 index 0000000..7eb44d3 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/blue_linoleum.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/floor/linoleum/blue_linoleum", + "particle": "new_soviet:block/floor/linoleum/blue_linoleum" + + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/blue_linoleum.json b/src/main/resources/assets/new_soviet/models/item/blue_linoleum.json new file mode 100644 index 0000000..c2ce602 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/blue_linoleum.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/blue_linoleum" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/brown_linoleum.json b/src/main/resources/assets/new_soviet/models/item/brown_linoleum.json new file mode 100644 index 0000000..79bfbed --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/brown_linoleum.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/brown_linoleum" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/cracked_glazed_teal_tiles.json b/src/main/resources/assets/new_soviet/models/item/cracked_glazed_teal_tiles.json new file mode 100644 index 0000000..83151dd --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/cracked_glazed_teal_tiles.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/cracked_glazed_teal_tiles" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/cross_brown_linoleum.json b/src/main/resources/assets/new_soviet/models/item/cross_brown_linoleum.json new file mode 100644 index 0000000..4eb7594 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/cross_brown_linoleum.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/cross_brown_linoleum" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/cross_orange_linoleum.json b/src/main/resources/assets/new_soviet/models/item/cross_orange_linoleum.json new file mode 100644 index 0000000..196f7ef --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/cross_orange_linoleum.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/cross_orange_linoleum" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/cyan_linoleum.json b/src/main/resources/assets/new_soviet/models/item/cyan_linoleum.json new file mode 100644 index 0000000..914213a --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/cyan_linoleum.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/cyan_linoleum" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/glazed_teal_tiles.json b/src/main/resources/assets/new_soviet/models/item/glazed_teal_tiles.json new file mode 100644 index 0000000..6a0bd4f --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/glazed_teal_tiles.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/glazed_teal_tiles" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/gray_linoleum.json b/src/main/resources/assets/new_soviet/models/item/gray_linoleum.json new file mode 100644 index 0000000..127b7af --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/gray_linoleum.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/gray_linoleum" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/green_linoleum.json b/src/main/resources/assets/new_soviet/models/item/green_linoleum.json new file mode 100644 index 0000000..06664c3 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/green_linoleum.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/green_linoleum" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/orange_linoleum.json b/src/main/resources/assets/new_soviet/models/item/orange_linoleum.json new file mode 100644 index 0000000..b6787f6 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/orange_linoleum.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/orange_linoleum" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/red_linoleum.json b/src/main/resources/assets/new_soviet/models/item/red_linoleum.json new file mode 100644 index 0000000..31fbebb --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/red_linoleum.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/red_linoleum" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/variated_teal_tiles.json b/src/main/resources/assets/new_soviet/models/item/variated_teal_tiles.json new file mode 100644 index 0000000..3091a7e --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/variated_teal_tiles.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/variated_teal_tiles" +} + diff --git a/src/main/resources/assets/new_soviet/textures/block/floor/linoleum/grey_linoleum.png b/src/main/resources/assets/new_soviet/textures/block/floor/linoleum/gray_linoleum.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/floor/linoleum/grey_linoleum.png rename to src/main/resources/assets/new_soviet/textures/block/floor/linoleum/gray_linoleum.png diff --git a/src/main/resources/assets/new_soviet/textures/block/floor/linoleum/oramge_linoleum.png b/src/main/resources/assets/new_soviet/textures/block/floor/linoleum/orange_linoleum.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/floor/linoleum/oramge_linoleum.png rename to src/main/resources/assets/new_soviet/textures/block/floor/linoleum/orange_linoleum.png diff --git a/src/main/resources/assets/new_soviet/textures/block/green/green_bricks_mossy.png b/src/main/resources/assets/new_soviet/textures/block/green/mossy_green_bricks.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/green/green_bricks_mossy.png rename to src/main/resources/assets/new_soviet/textures/block/green/mossy_green_bricks.png diff --git a/src/main/resources/assets/new_soviet/textures/block/light_blue/glazed_light_blue_tile1_cracked.png b/src/main/resources/assets/new_soviet/textures/block/light_blue/cracked_glazed_light_blue_tiles.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/light_blue/glazed_light_blue_tile1_cracked.png rename to src/main/resources/assets/new_soviet/textures/block/light_blue/cracked_glazed_light_blue_tiles.png diff --git a/src/main/resources/assets/new_soviet/textures/block/light_blue/light_blue_bricks_mossy.png b/src/main/resources/assets/new_soviet/textures/block/light_blue/mossy_light_blue_bricks.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/light_blue/light_blue_bricks_mossy.png rename to src/main/resources/assets/new_soviet/textures/block/light_blue/mossy_light_blue_bricks.png diff --git a/src/main/resources/assets/new_soviet/textures/block/light_blue/cracked_small_light_blue_tiles.png b/src/main/resources/assets/new_soviet/textures/block/light_blue/small_cracked_light_blue_tiles.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/light_blue/cracked_small_light_blue_tiles.png rename to src/main/resources/assets/new_soviet/textures/block/light_blue/small_cracked_light_blue_tiles.png diff --git a/src/main/resources/assets/new_soviet/textures/block/light_blue/lb_tiles_misc1.png b/src/main/resources/assets/new_soviet/textures/block/light_blue/variated_light_blue_tiles.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/light_blue/lb_tiles_misc1.png rename to src/main/resources/assets/new_soviet/textures/block/light_blue/variated_light_blue_tiles.png diff --git a/src/main/resources/assets/new_soviet/textures/block/teal/blue_big_tile_cracked.png b/src/main/resources/assets/new_soviet/textures/block/teal/variated_teal_tiles.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/teal/blue_big_tile_cracked.png rename to src/main/resources/assets/new_soviet/textures/block/teal/variated_teal_tiles.png