From 6c6c90ed4b42e9f6793941e095337481025ab037 Mon Sep 17 00:00:00 2001 From: Andrew-71 Date: Sun, 6 Aug 2023 14:37:17 +0300 Subject: [PATCH] Doors, sirens and blocks --- .../su/a71/new_soviet/DataGeneration.java | 4 + .../su/a71/new_soviet/blocks/SirenBlock.java | 4 +- .../new_soviet/registration/NSE_Blocks.java | 13 ++ .../blockstates/chiseled_birch_door.json | 124 ++++++++++++++++++ .../cracked_glazed_white_tiles.json | 7 + .../blockstates/glazed_white_tiles.json | 7 + .../small_cracked_white_tiles.json | 7 + .../blockstates/small_white_tiles.json | 7 + .../assets/new_soviet/lang/en_us.json | 1 + .../chiseled_birch_door_bottom_left.json | 7 + .../chiseled_birch_door_bottom_left_open.json | 7 + .../chiseled_birch_door_bottom_right.json | 7 + ...chiseled_birch_door_bottom_right_open.json | 7 + .../block/chiseled_birch_door_top_left.json | 7 + .../chiseled_birch_door_top_left_open.json | 7 + .../block/chiseled_birch_door_top_right.json | 7 + .../chiseled_birch_door_top_right_open.json | 7 + .../block/cracked_glazed_white_tiles.json | 7 + .../models/block/glazed_white_tiles.json | 7 + .../block/small_cracked_white_tiles.json | 7 + .../models/block/small_white_tiles.json | 8 ++ .../models/item/chiseled_birch_door.json | 6 + .../models/item/chiseled_mangrove_door.json | 2 +- .../models/item/chiseled_oak_door.json | 2 +- .../models/item/chiseled_spruce_door.json | 2 +- .../item/cracked_glazed_white_tiles.json | 4 + .../item/small_cracked_white_tiles.json | 4 + .../models/item/small_white_tiles.json | 4 + .../block/doors/chiseled_birch_door_lower.png | Bin 0 -> 371 bytes .../block/doors/chiseled_birch_door_upper.png | Bin 0 -> 396 bytes ...ked.png => cracked_glazed_white_tiles.png} | Bin ...white_tile1.png => glazed_white_tiles.png} | Bin .../textures/item/chiseled_mangrove_door.png | Bin 250 -> 0 bytes .../textures/item/chiseled_oak_door.png | Bin 234 -> 0 bytes .../textures/item/chiseled_spruce_door.png | Bin 362 -> 0 bytes .../item/doors/chiseled_birch_door.png | Bin 0 -> 395 bytes .../item/doors/chiseled_mangrove_door.png | Bin 0 -> 333 bytes .../textures/item/doors/chiseled_oak_door.png | Bin 0 -> 416 bytes .../item/doors/chiseled_spruce_door.png | Bin 0 -> 427 bytes src/main/resources/fabric.mod.json | 4 +- 40 files changed, 280 insertions(+), 7 deletions(-) create mode 100644 src/main/resources/assets/new_soviet/blockstates/chiseled_birch_door.json create mode 100644 src/main/resources/assets/new_soviet/blockstates/cracked_glazed_white_tiles.json create mode 100644 src/main/resources/assets/new_soviet/blockstates/glazed_white_tiles.json create mode 100644 src/main/resources/assets/new_soviet/blockstates/small_cracked_white_tiles.json create mode 100644 src/main/resources/assets/new_soviet/blockstates/small_white_tiles.json create mode 100644 src/main/resources/assets/new_soviet/models/block/chiseled_birch_door_bottom_left.json create mode 100644 src/main/resources/assets/new_soviet/models/block/chiseled_birch_door_bottom_left_open.json create mode 100644 src/main/resources/assets/new_soviet/models/block/chiseled_birch_door_bottom_right.json create mode 100644 src/main/resources/assets/new_soviet/models/block/chiseled_birch_door_bottom_right_open.json create mode 100644 src/main/resources/assets/new_soviet/models/block/chiseled_birch_door_top_left.json create mode 100644 src/main/resources/assets/new_soviet/models/block/chiseled_birch_door_top_left_open.json create mode 100644 src/main/resources/assets/new_soviet/models/block/chiseled_birch_door_top_right.json create mode 100644 src/main/resources/assets/new_soviet/models/block/chiseled_birch_door_top_right_open.json create mode 100644 src/main/resources/assets/new_soviet/models/block/cracked_glazed_white_tiles.json create mode 100644 src/main/resources/assets/new_soviet/models/block/glazed_white_tiles.json create mode 100644 src/main/resources/assets/new_soviet/models/block/small_cracked_white_tiles.json create mode 100644 src/main/resources/assets/new_soviet/models/block/small_white_tiles.json create mode 100644 src/main/resources/assets/new_soviet/models/item/chiseled_birch_door.json create mode 100644 src/main/resources/assets/new_soviet/models/item/cracked_glazed_white_tiles.json create mode 100644 src/main/resources/assets/new_soviet/models/item/small_cracked_white_tiles.json create mode 100644 src/main/resources/assets/new_soviet/models/item/small_white_tiles.json create mode 100644 src/main/resources/assets/new_soviet/textures/block/doors/chiseled_birch_door_lower.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/doors/chiseled_birch_door_upper.png rename src/main/resources/assets/new_soviet/textures/block/white/{glazed_white_tile1_cracked.png => cracked_glazed_white_tiles.png} (100%) rename src/main/resources/assets/new_soviet/textures/block/white/{glazed_white_tile1.png => glazed_white_tiles.png} (100%) delete mode 100644 src/main/resources/assets/new_soviet/textures/item/chiseled_mangrove_door.png delete mode 100644 src/main/resources/assets/new_soviet/textures/item/chiseled_oak_door.png delete mode 100644 src/main/resources/assets/new_soviet/textures/item/chiseled_spruce_door.png create mode 100644 src/main/resources/assets/new_soviet/textures/item/doors/chiseled_birch_door.png create mode 100644 src/main/resources/assets/new_soviet/textures/item/doors/chiseled_mangrove_door.png create mode 100644 src/main/resources/assets/new_soviet/textures/item/doors/chiseled_oak_door.png create mode 100644 src/main/resources/assets/new_soviet/textures/item/doors/chiseled_spruce_door.png diff --git a/src/main/java/su/a71/new_soviet/DataGeneration.java b/src/main/java/su/a71/new_soviet/DataGeneration.java index 82c55bd..5b289ac 100644 --- a/src/main/java/su/a71/new_soviet/DataGeneration.java +++ b/src/main/java/su/a71/new_soviet/DataGeneration.java @@ -18,6 +18,7 @@ import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder; import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder; import net.minecraft.item.ItemConvertible; import net.minecraft.item.Items; +import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.book.RecipeCategory; import net.minecraft.registry.RegistryWrapper; import net.minecraft.registry.tag.BlockTags; @@ -660,6 +661,9 @@ public class DataGeneration implements DataGeneratorEntrypoint { offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.CHISELED_MANGROVE_DOOR, Blocks.MANGROVE_DOOR); offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.CHISELED_OAK_DOOR, Blocks.OAK_DOOR); offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.CHISELED_SPRUCE_DOOR, Blocks.SPRUCE_DOOR); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.CHISELED_BIRCH_DOOR, Blocks.BIRCH_BUTTON); + + createStairsRecipe(NSE_Blocks.SAND_TILES_STAIRS, Ingredient.ofItems(NSE_Blocks.SAND_TILES)); } } diff --git a/src/main/java/su/a71/new_soviet/blocks/SirenBlock.java b/src/main/java/su/a71/new_soviet/blocks/SirenBlock.java index a057caa..4db208d 100644 --- a/src/main/java/su/a71/new_soviet/blocks/SirenBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/SirenBlock.java @@ -43,7 +43,7 @@ public class SirenBlock extends HorizontalFacingBlock { if (bl) { world.scheduleBlockTick(pos, this, 4); } else { - world.playSound((PlayerEntity)null, pos.getX(), pos.getY(), pos.getZ(), NSE_Custom.SIREN_SOUND, SoundCategory.NEUTRAL, 1F, 1f); + world.playSound((PlayerEntity)null, pos.getX(), pos.getY(), pos.getZ(), NSE_Custom.SIREN_SOUND, SoundCategory.NEUTRAL, 5F, 1f); world.setBlockState(pos, (BlockState)state.cycle(ON), 2); world.scheduleBlockTick(pos, this, 140); } @@ -88,7 +88,7 @@ public class SirenBlock extends HorizontalFacingBlock { } else { NewSoviet.LOG.info("Playing!"); - world.playSound((PlayerEntity)null, pos.getX(), pos.getY(), pos.getZ(), NSE_Custom.SIREN_SOUND, SoundCategory.NEUTRAL, 1F, 1f); + world.playSound((PlayerEntity)null, pos.getX(), pos.getY(), pos.getZ(), NSE_Custom.SIREN_SOUND, SoundCategory.NEUTRAL, 5F, 1f); world.scheduleBlockTick(pos, this, 140); } } 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 88efdaf..688c0a7 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 @@ -25,6 +25,7 @@ public class NSE_Blocks { // BUILDING BRICKS/TILES ==================== public static final Block SAND_TILES = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.MUD_BRICKS).hardness(1.5f).requiresTool().resistance(6f).mapColor(MapColor.TERRACOTTA_BROWN)); + public static final StairsBlock SAND_TILES_STAIRS = new StairsBlock(SAND_TILES.getDefaultState(), FabricBlockSettings.copy(SAND_TILES)); public static final Block CRACKED_SAND_TILES = new Block(FabricBlockSettings.copy(SAND_TILES)); public static final Block MOSSY_SAND_TILES = new Block(FabricBlockSettings.copy(SAND_TILES)); public static final Block SMALL_SAND_TILES = new Block(FabricBlockSettings.copy(SAND_TILES)); @@ -106,6 +107,11 @@ public class NSE_Blocks { public static final Block CRACKED_TUFF_BRICKS = new Block(FabricBlockSettings.copy(Blocks.TUFF)); public static final Block MOSSY_TUFF_BRICKS = new Block(FabricBlockSettings.copy(Blocks.TUFF)); + public static final Block SMALL_WHITE_TILES = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).strength(1.5f, 6f).requiresTool().mapColor(MapColor.WHITE)); + public static final Block SMALL_CRACKED_WHITE_TILES = new Block(FabricBlockSettings.copy(LIGHT_BLUE_TILES)); + public static final Block GLAZED_WHITE_TILES = new Block(FabricBlockSettings.copy(LIGHT_BLUE_TILES)); + public static final Block CRACKED_GLAZED_WHITE_TILES = new Block(FabricBlockSettings.copy(LIGHT_BLUE_TILES)); + public static final Block WHITEWASH = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).strength(1.5f, 6f).requiresTool().mapColor(MapColor.OFF_WHITE)); public static final Block CRACKED_WHITEWASH = new Block(FabricBlockSettings.copy(WHITEWASH)); public static final Block VERY_CRACKED_WHITEWASH = new Block(FabricBlockSettings.copy(WHITEWASH)); @@ -164,6 +170,7 @@ public class NSE_Blocks { public static final DoorBlock CHISELED_MANGROVE_DOOR = new DoorBlock(FabricBlockSettings.copy(Blocks.MANGROVE_DOOR), BlockSetType.MANGROVE); public static final DoorBlock CHISELED_OAK_DOOR = new DoorBlock(FabricBlockSettings.copy(Blocks.OAK_DOOR), BlockSetType.OAK); public static final DoorBlock CHISELED_SPRUCE_DOOR = new DoorBlock(FabricBlockSettings.copy(Blocks.SPRUCE_DOOR), BlockSetType.SPRUCE); + public static final DoorBlock CHISELED_BIRCH_DOOR = new DoorBlock(FabricBlockSettings.copy(Blocks.BIRCH_DOOR), BlockSetType.BIRCH); // Industrial ===================================== public static final Block INDUSTRIAL_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).hardness(4f).resistance(6f).requiresTool().mapColor(MapColor.BLACK)); @@ -203,6 +210,7 @@ public class NSE_Blocks { public static void init() { Registry.register(Registries.ITEM_GROUP, new Identifier("new_soviet", "building_blocks"), NSE_BUILDING_TAB); register("sand_tiles", () -> SAND_TILES, NSE_BUILDING_TAB); + register("sand_tiles_stairs", () -> SAND_TILES_STAIRS, NSE_BUILDING_TAB); register("cracked_sand_tiles", () -> CRACKED_SAND_TILES, NSE_BUILDING_TAB); register("mossy_sand_tiles", () -> MOSSY_SAND_TILES, NSE_BUILDING_TAB); register("small_sand_tiles", () -> SMALL_SAND_TILES, NSE_BUILDING_TAB); @@ -273,6 +281,10 @@ public class NSE_Blocks { register("tuff_bricks", () -> TUFF_BRICKS, NSE_BUILDING_TAB); register("cracked_tuff_bricks", () -> CRACKED_TUFF_BRICKS, NSE_BUILDING_TAB); register("mossy_tuff_bricks", () -> MOSSY_TUFF_BRICKS, NSE_BUILDING_TAB); + register("small_white_tiles", () -> SMALL_WHITE_TILES, NSE_BUILDING_TAB); + register("small_cracked_white_tiles", () -> SMALL_CRACKED_WHITE_TILES, NSE_BUILDING_TAB); + register("glazed_white_tiles", () -> GLAZED_WHITE_TILES, NSE_BUILDING_TAB); + register("cracked_glazed_white_tiles", () -> CRACKED_GLAZED_WHITE_TILES, NSE_BUILDING_TAB); register("whitewash", () -> WHITEWASH, NSE_BUILDING_TAB); register("cracked_whitewash", () -> CRACKED_WHITEWASH, NSE_BUILDING_TAB); @@ -331,6 +343,7 @@ public class NSE_Blocks { register("chiseled_mangrove_door", () -> CHISELED_MANGROVE_DOOR, NSE_BUILDING_TAB); register("chiseled_oak_door", () -> CHISELED_OAK_DOOR, NSE_BUILDING_TAB); register("chiseled_spruce_door", () -> CHISELED_SPRUCE_DOOR, NSE_BUILDING_TAB); + register("chiseled_birch_door", () -> CHISELED_BIRCH_DOOR, NSE_BUILDING_TAB); register("industrial_warning", () -> INDUSTRIAL_WARNING, NSE_BUILDING_TAB); register("gray_warning", () -> GRAY_WARNING, NSE_BUILDING_TAB); diff --git a/src/main/resources/assets/new_soviet/blockstates/chiseled_birch_door.json b/src/main/resources/assets/new_soviet/blockstates/chiseled_birch_door.json new file mode 100644 index 0000000..b68fca7 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/chiseled_birch_door.json @@ -0,0 +1,124 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { + "model": "new_soviet:block/chiseled_birch_door_bottom_left" + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "new_soviet:block/chiseled_birch_door_bottom_left_open", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "new_soviet:block/chiseled_birch_door_bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "new_soviet:block/chiseled_birch_door_bottom_right_open", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "new_soviet:block/chiseled_birch_door_top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "new_soviet:block/chiseled_birch_door_top_left_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "new_soviet:block/chiseled_birch_door_top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "new_soviet:block/chiseled_birch_door_top_right_open", + "y": 270 + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "new_soviet:block/chiseled_birch_door_bottom_left", + "y": 270 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "new_soviet:block/chiseled_birch_door_bottom_left_open" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "new_soviet:block/chiseled_birch_door_bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "new_soviet:block/chiseled_birch_door_bottom_right_open", + "y": 180 + }, + "facing=north,half=upper,hinge=left,open=false": { + "model": "new_soviet:block/chiseled_birch_door_top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "new_soviet:block/chiseled_birch_door_top_left_open" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "new_soviet:block/chiseled_birch_door_top_right", + "y": 270 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "new_soviet:block/chiseled_birch_door_top_right_open", + "y": 180 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "new_soviet:block/chiseled_birch_door_bottom_left", + "y": 90 + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "new_soviet:block/chiseled_birch_door_bottom_left_open", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "new_soviet:block/chiseled_birch_door_bottom_right", + "y": 90 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "new_soviet:block/chiseled_birch_door_bottom_right_open" + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "new_soviet:block/chiseled_birch_door_top_left", + "y": 90 + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "new_soviet:block/chiseled_birch_door_top_left_open", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "new_soviet:block/chiseled_birch_door_top_right", + "y": 90 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "new_soviet:block/chiseled_birch_door_top_right_open" + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "new_soviet:block/chiseled_birch_door_bottom_left", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "new_soviet:block/chiseled_birch_door_bottom_left_open", + "y": 270 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "new_soviet:block/chiseled_birch_door_bottom_right", + "y": 180 + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "new_soviet:block/chiseled_birch_door_bottom_right_open", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "new_soviet:block/chiseled_birch_door_top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "new_soviet:block/chiseled_birch_door_top_left_open", + "y": 270 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "new_soviet:block/chiseled_birch_door_top_right", + "y": 180 + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "new_soviet:block/chiseled_birch_door_top_right_open", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/cracked_glazed_white_tiles.json b/src/main/resources/assets/new_soviet/blockstates/cracked_glazed_white_tiles.json new file mode 100644 index 0000000..6f53af6 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/cracked_glazed_white_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/cracked_glazed_white_tiles" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/glazed_white_tiles.json b/src/main/resources/assets/new_soviet/blockstates/glazed_white_tiles.json new file mode 100644 index 0000000..39ba060 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/glazed_white_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/glazed_white_tiles" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/small_cracked_white_tiles.json b/src/main/resources/assets/new_soviet/blockstates/small_cracked_white_tiles.json new file mode 100644 index 0000000..9b99127 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/small_cracked_white_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/small_cracked_white_tiles" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/small_white_tiles.json b/src/main/resources/assets/new_soviet/blockstates/small_white_tiles.json new file mode 100644 index 0000000..80ead48 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/small_white_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/small_white_tiles" + } + } +} \ No newline at end of file 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 4895a78..7118e1c 100644 --- a/src/main/resources/assets/new_soviet/lang/en_us.json +++ b/src/main/resources/assets/new_soviet/lang/en_us.json @@ -141,6 +141,7 @@ "block.new_soviet.chiseled_mangrove_door": "Chiseled Mangrove Door", "block.new_soviet.chiseled_oak_door": "Chiseled Oak Door", "block.new_soviet.chiseled_spruce_door": "Chiseled Spruce Door", + "block.new_soviet.chiseled_birch_door": "Chiseled Birch Door", "subtitles.new_soviet.siren": "Siren goes off", "block.new_soviet.yellow_concrete_with_bars": "Yellow Concrete With Bars", "block.new_soviet.beige_concrete_with_bars": "Beige Concrete With Bars", diff --git a/src/main/resources/assets/new_soviet/models/block/chiseled_birch_door_bottom_left.json b/src/main/resources/assets/new_soviet/models/block/chiseled_birch_door_bottom_left.json new file mode 100644 index 0000000..d24d8fa --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/chiseled_birch_door_bottom_left.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left", + "textures": { + "bottom": "new_soviet:block/doors/chiseled_birch_door_lower", + "top": "new_soviet:block/doors/chiseled_birch_door_upper" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/chiseled_birch_door_bottom_left_open.json b/src/main/resources/assets/new_soviet/models/block/chiseled_birch_door_bottom_left_open.json new file mode 100644 index 0000000..7a52828 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/chiseled_birch_door_bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "new_soviet:block/doors/chiseled_birch_door_lower", + "top": "new_soviet:block/doors/chiseled_birch_door_upper" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/chiseled_birch_door_bottom_right.json b/src/main/resources/assets/new_soviet/models/block/chiseled_birch_door_bottom_right.json new file mode 100644 index 0000000..d789122 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/chiseled_birch_door_bottom_right.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right", + "textures": { + "bottom": "new_soviet:block/doors/chiseled_birch_door_lower", + "top": "new_soviet:block/doors/chiseled_birch_door_upper" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/chiseled_birch_door_bottom_right_open.json b/src/main/resources/assets/new_soviet/models/block/chiseled_birch_door_bottom_right_open.json new file mode 100644 index 0000000..6609eb0 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/chiseled_birch_door_bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "new_soviet:block/doors/chiseled_birch_door_lower", + "top": "new_soviet:block/doors/chiseled_birch_door_upper" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/chiseled_birch_door_top_left.json b/src/main/resources/assets/new_soviet/models/block/chiseled_birch_door_top_left.json new file mode 100644 index 0000000..19ed3b9 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/chiseled_birch_door_top_left.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left", + "textures": { + "bottom": "new_soviet:block/doors/chiseled_birch_door_lower", + "top": "new_soviet:block/doors/chiseled_birch_door_upper" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/chiseled_birch_door_top_left_open.json b/src/main/resources/assets/new_soviet/models/block/chiseled_birch_door_top_left_open.json new file mode 100644 index 0000000..30cc117 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/chiseled_birch_door_top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "new_soviet:block/doors/chiseled_birch_door_lower", + "top": "new_soviet:block/doors/chiseled_birch_door_upper" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/chiseled_birch_door_top_right.json b/src/main/resources/assets/new_soviet/models/block/chiseled_birch_door_top_right.json new file mode 100644 index 0000000..dd5e209 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/chiseled_birch_door_top_right.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right", + "textures": { + "bottom": "new_soviet:block/doors/chiseled_birch_door_lower", + "top": "new_soviet:block/doors/chiseled_birch_door_upper" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/chiseled_birch_door_top_right_open.json b/src/main/resources/assets/new_soviet/models/block/chiseled_birch_door_top_right_open.json new file mode 100644 index 0000000..f73e8e5 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/chiseled_birch_door_top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "new_soviet:block/doors/chiseled_birch_door_lower", + "top": "new_soviet:block/doors/chiseled_birch_door_upper" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/cracked_glazed_white_tiles.json b/src/main/resources/assets/new_soviet/models/block/cracked_glazed_white_tiles.json new file mode 100644 index 0000000..6e40664 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/cracked_glazed_white_tiles.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "new_soviet:block/white/cracked_glazed_white_tiles", + "particle": "new_soviet:block/white/cracked_glazed_white_tiles" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/glazed_white_tiles.json b/src/main/resources/assets/new_soviet/models/block/glazed_white_tiles.json new file mode 100644 index 0000000..4b416c5 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/glazed_white_tiles.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "new_soviet:block/white/glazed_white_tiles", + "particle": "new_soviet:block/white/glazed_white_tiles" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/small_cracked_white_tiles.json b/src/main/resources/assets/new_soviet/models/block/small_cracked_white_tiles.json new file mode 100644 index 0000000..f609cdb --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/small_cracked_white_tiles.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "new_soviet:block/white/small_cracked_white_tiles", + "particle": "new_soviet:block/white/small_cracked_white_tiles" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/small_white_tiles.json b/src/main/resources/assets/new_soviet/models/block/small_white_tiles.json new file mode 100644 index 0000000..6d34608 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/small_white_tiles.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/white/small_white_tiles", + "particle": "new_soviet:block/white/small_white_tiles" + } +} + diff --git a/src/main/resources/assets/new_soviet/models/item/chiseled_birch_door.json b/src/main/resources/assets/new_soviet/models/item/chiseled_birch_door.json new file mode 100644 index 0000000..840e835 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/chiseled_birch_door.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "new_soviet:item/doors/chiseled_birch_door" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/chiseled_mangrove_door.json b/src/main/resources/assets/new_soviet/models/item/chiseled_mangrove_door.json index 804c9d5..656b93d 100644 --- a/src/main/resources/assets/new_soviet/models/item/chiseled_mangrove_door.json +++ b/src/main/resources/assets/new_soviet/models/item/chiseled_mangrove_door.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "new_soviet:item/chiseled_mangrove_door" + "layer0": "new_soviet:item/doors/chiseled_mangrove_door" } } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/chiseled_oak_door.json b/src/main/resources/assets/new_soviet/models/item/chiseled_oak_door.json index c1b2467..d7ecb12 100644 --- a/src/main/resources/assets/new_soviet/models/item/chiseled_oak_door.json +++ b/src/main/resources/assets/new_soviet/models/item/chiseled_oak_door.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "new_soviet:item/chiseled_oak_door" + "layer0": "new_soviet:item/doors/chiseled_oak_door" } } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/chiseled_spruce_door.json b/src/main/resources/assets/new_soviet/models/item/chiseled_spruce_door.json index 6b503ca..2e11366 100644 --- a/src/main/resources/assets/new_soviet/models/item/chiseled_spruce_door.json +++ b/src/main/resources/assets/new_soviet/models/item/chiseled_spruce_door.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "new_soviet:item/chiseled_spruce_door" + "layer0": "new_soviet:item/doors/chiseled_spruce_door" } } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/cracked_glazed_white_tiles.json b/src/main/resources/assets/new_soviet/models/item/cracked_glazed_white_tiles.json new file mode 100644 index 0000000..d2915dd --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/cracked_glazed_white_tiles.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/cracked_glazed_white_tiles" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/small_cracked_white_tiles.json b/src/main/resources/assets/new_soviet/models/item/small_cracked_white_tiles.json new file mode 100644 index 0000000..59a1275 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/small_cracked_white_tiles.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/small_cracked_white_tiles" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/small_white_tiles.json b/src/main/resources/assets/new_soviet/models/item/small_white_tiles.json new file mode 100644 index 0000000..6507711 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/small_white_tiles.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/small_white_tiles" +} + diff --git a/src/main/resources/assets/new_soviet/textures/block/doors/chiseled_birch_door_lower.png b/src/main/resources/assets/new_soviet/textures/block/doors/chiseled_birch_door_lower.png new file mode 100644 index 0000000000000000000000000000000000000000..b62b6e58e96cf1e2e7f9f93d24d5689704681bd6 GIT binary patch literal 371 zcmV-(0gV2MP)Px$ElET{R49>!Qn5Z80r(#Ki$uak?pP`}18m1H1_t+XRHg7jP zOIZ;1Z$tyn(ub#atEr2!5Px$MoC0LR5*>5lD|p=K@i4&Ipmft5<&u|va(5&A`mPNB55R*r4M3h>7)1#Hg<}g z1OirqCJG@Cf;o;$vFtXnICrzTKcLgh&CYz^d^0z-)z|%wU)!b|{$pxA;|Snw@&rJu zDgO+P6UB0sW&{B9&u`{lfsmp5*2)~j0KIO9oLsL{U^obm0!k zTD{R`n{G;%y8d`!GF@b+9487PL!KWVT|xeE{1JxZ(f$tn0;^!qKS3))uiF8#(-ksg q&_5~eplo(|eCoXItd()^zWo5{IiH1S80+-_0000_=M?GGD~8RZ^KoFP00@>w1u0snOQkK-NFQq so>Wm+iLg?*&CLS@@%6QbS4v1TFl4^eT~_2(4Dt+vr>mdKI;Vst02-TFp#T5? diff --git a/src/main/resources/assets/new_soviet/textures/item/chiseled_oak_door.png b/src/main/resources/assets/new_soviet/textures/item/chiseled_oak_door.png deleted file mode 100644 index 07ca5dfcf736dcf28388ea1d043566c45563e61d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`)Ym%P6qN9db&7< zSo9_*NMs!7ICHXS+W+nDy zAzxen`nm-jhKj{0DWZk9dbk(taCrLO7bxesBUeS5f%#R`BniKxtO0up9!N_2wHkll zlX|0SGXH*Vg~Sh>s~KPF9g29mp^fq8#SVW(W@f>Q9r`>4jB^ql!b}bwYM7F7goC+; dv4fX^;e5MZjeg(O^FYTkc)I$ztaD0e0syEmQ=R|- diff --git a/src/main/resources/assets/new_soviet/textures/item/chiseled_spruce_door.png b/src/main/resources/assets/new_soviet/textures/item/chiseled_spruce_door.png deleted file mode 100644 index 6bf39881b1f660693970af719cb38e10d967e389..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 362 zcmV-w0hRuVP)yfK z6qZs_j5cedrP4_B5HsvHP4woRc4qdyH*a=<|Bfv+xxMzj*gpFe)E_($ZdYxH%)y26 z)(C!Ierox)n)ob+ePC)AT+4)OnFKy_ZLP0O0058UCpw2+4geU5SE^Y@nr4+C>~hF? z4giqz9Fa^({j_ak`kdDjh|EE_rV_~le0knp*QyfuEXGI}kh5hm?y*6=;e;ay0(jYd zvjuf&kxUi!DSCGkcvm~k7CNiqoGenRm%eX0+PB$kfuC^Ndbv22Fj+JZs8NFVT0hoW zCO%fxdldrp&BrfE9sgzmkvXtXeC0! zKU)r(SpE3-O0RjIw{VPn8{_S;^{ENZQ<8uD{3|}gjm===i#an3YJCEvcxs%b4{q7q zuOFec|(gvykLqyw9FS|&){eW_r#D?5SVD1$(QCd*AOrfu)|5~PkC7gN&- zkYbg&SILkwVGE1=;mhLl4}97CJO4qOA~TP81A~X+iSw7TtO|ZT61Hnw@kBGh&d9-# zL8Np?!^~Iw2EB4(8f*=JI5sh+2>2*=v`NMYk-W%v k1*sNCsf(t@1_lNU3@)WDN&WSupa5m?boFyt=akR{06y)IWdHyG literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/new_soviet/textures/item/doors/chiseled_mangrove_door.png b/src/main/resources/assets/new_soviet/textures/item/doors/chiseled_mangrove_door.png new file mode 100644 index 0000000000000000000000000000000000000000..0afe9f187ad7f60747812839ffd7f4a11ab13754 GIT binary patch literal 333 zcmV-T0kZyyP)Px$2T4RhR5*>rl0R<3Fc`%jQDX;^3Zjakdr#4wk+BEpc{oH5z|1AOpsp3|gj6J? zrjXc)KO|s4w(K|rI`O9W`Oov`pAFnv9lMx}pAU9j2tpDw6oSl{%mPg2?`Gd!J#qP! z<9E9Ok3yvP5BUCE8c(W(AnB|R?BZ>)1^~06m+k?;@pU-?uTMi~GKm>@6dKQX7pmHw z5725mT?cA83^c6OdIg@Ju3>usmpfp*+sNQ!IKZsRybinoQl;@WgAp&9Zu>t5qfX?l zbr>Wu!yi;DgVqiTL1!8C(*5OUoc?T_$@)LA`7{Q+JoZ7Vy!sb<3}hBSkc1$KEI*B@ fY6qT&Uh7&%B0g^lG&7+y00000NkvXXu0mjfE1K?K zPJ$H6zP~@1pWm< zki>ApE#<($b8O}=9rL+;7Bh=5J1~evDA*r1Y0gk&j5CmyO^{$suK4fHpIXAe<gTe~ HDWM4fYfhXh literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/new_soviet/textures/item/doors/chiseled_spruce_door.png b/src/main/resources/assets/new_soviet/textures/item/doors/chiseled_spruce_door.png new file mode 100644 index 0000000000000000000000000000000000000000..3a68d05446e9fbd69b3578c9e3a13ad08d60475f GIT binary patch literal 427 zcmV;c0aX5pP)Px$Wl2OqR5*>rl1)njQ51$B!D1FQbAj}iXft`KcP)OrT-P}avQX8(P9WP z3GYHt90$Lzqi73j^!l~!?#|(TUe0;%f&YGi_2Tj2W|1&;0J=ku(}=E!yF-t%UE`_T z^ts@=pj2IOm25K@&j3iD#Q+fP4%5*TEv#W28;Yr7kkwka4#{l-vB^*V3|<>f0aT$f%L%8H`O~b$Z9P`unw2)+ExZf>qRja zKnrXB=(+S^c+0@hVLF;3Cz8TthR(1@sk-33e@-xc$Hnda;T4`g79{5@*fOKIP7^5v z02T3ic!lI#kg`lfyF)Az#r|p{Clce>@WIWmR3=DSCWG;elTeVVSixpI1fbl=P6Nw~ zf(fa381l