Ethyl/New-Soviet-Era
Ethyl/New-Soviet-Era
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: Ethyl:9c0ea2f5bea0d37214c254a081895132f1359b04
Branches Tags
Ethyl:1.20
Ethyl:1.20.1
..
compare: Ethyl:37e3a8c2db4ecb7a865257158efbac6f488eaf75
Branches Tags
Ethyl:1.20.1
Ethyl:1.20

No commits in common. "9c0ea2f5bea0d37214c254a081895132f1359b04" and "37e3a8c2db4ecb7a865257158efbac6f488eaf75" have entirely different histories.
9c0ea2f5be ... 37e3a8c2db

13 changed files with 8 additions and 582 deletions
Show stats Expand all files Collapse all files

1
TODO.md
View file

@ -12,7 +12,6 @@
* Add achievement criterion for dice and advancements * Add achievement criterion for dice and advancements
* PO2 wall (fix) * PO2 wall (fix)
* What's switch type 2? * What's switch type 2?
* Populate blocktags e.g. PLANKS
=== ACHIEVEMENTS === === ACHIEVEMENTS ===
Kolkhoz warrior - kill a zombie, skeleton, creeper and spider with a sickle Kolkhoz warrior - kill a zombie, skeleton, creeper and spider with a sickle

9
src/main/generated/data/minecraft/tags/blocks/doors.json
View file

@ -1,9 +0,0 @@
{
"replace": false,
"values": [
"new_soviet:chiseled_birch_door",
"new_soviet:chiseled_oak_door",
"new_soviet:chiseled_mangrove_door",
"new_soviet:chiseled_spruce_door"
]
}

3
src/main/generated/data/minecraft/tags/blocks/mineable/axe.json
View file

@ -89,7 +89,6 @@
"new_soviet:brown_linoleum_stairs", "new_soviet:brown_linoleum_stairs",
"new_soviet:brown_linoleum_slab", "new_soviet:brown_linoleum_slab",
"new_soviet:cyan_linoleum_stairs", "new_soviet:cyan_linoleum_stairs",
"new_soviet:cyan_linoleum_slab", "new_soviet:cyan_linoleum_slab"
"new_soviet:table_lamp"
] ]
} }

4
src/main/generated/data/minecraft/tags/blocks/mineable/pickaxe.json
View file

@ -267,8 +267,6 @@
"new_soviet:nii_floor_stairs", "new_soviet:nii_floor_stairs",
"new_soviet:nii_floor_slab", "new_soviet:nii_floor_slab",
"new_soviet:metal_plating_stairs", "new_soviet:metal_plating_stairs",
"new_soviet:metal_plating_slab", "new_soviet:metal_plating_slab"
"new_soviet:vintage_lamp",
"new_soviet:light_bulb_lamp"
] ]
} }

21
src/main/generated/data/minecraft/tags/blocks/planks.json
View file

@ -1,21 +0,0 @@
{
"replace": false,
"values": [
"new_soviet:herringbone_acacia_planks",
"new_soviet:cross_acacia_planks",
"new_soviet:herringbone_oak_planks",
"new_soviet:cross_oak_planks",
"new_soviet:herringbone_birch_planks",
"new_soviet:cross_birch_planks",
"new_soviet:herringbone_crimson_planks",
"new_soviet:cross_crimson_planks",
"new_soviet:herringbone_dark_oak_planks",
"new_soviet:cross_dark_oak_planks",
"new_soviet:herringbone_jungle_planks",
"new_soviet:cross_jungle_planks",
"new_soviet:herringbone_mangrove_planks",
"new_soviet:cross_mangrove_planks",
"new_soviet:herringbone_spruce_planks",
"new_soviet:cross_spruce_planks"
]
}

106
src/main/generated/data/minecraft/tags/blocks/slabs.json
View file

@ -1,106 +0,0 @@
{
"replace": false,
"values": [
"new_soviet:sand_tiles_slab",
"new_soviet:cracked_sand_tiles_slab",
"new_soviet:mossy_sand_tiles_slab",
"new_soviet:herringbone_sand_tiles_slab",
"new_soviet:cross_sand_tiles_slab",
"new_soviet:sand_bricks_slab",
"new_soviet:cracked_sand_bricks_slab",
"new_soviet:mossy_sand_bricks_slab",
"new_soviet:big_sand_bricks_slab",
"new_soviet:brick_tiles_slab",
"new_soviet:cracked_brick_tiles_slab",
"new_soviet:mossy_brick_tiles_slab",
"new_soviet:dirty_brick_tiles_slab",
"new_soviet:dark_brick_tiles_slab",
"new_soviet:cracked_dark_brick_tiles_slab",
"new_soviet:mossy_dark_brick_tiles_slab",
"new_soviet:dirty_dark_brick_tiles_slab",
"new_soviet:red_bricks_slab",
"new_soviet:cracked_red_bricks_slab",
"new_soviet:mossy_red_bricks_slab",
"new_soviet:teal_tiles_slab",
"new_soviet:cracked_teal_tiles_slab",
"new_soviet:mossy_teal_tiles_slab",
"new_soviet:variated_teal_tiles_slab",
"new_soviet:green_bricks_slab",
"new_soviet:cracked_green_bricks_slab",
"new_soviet:mossy_green_bricks_slab",
"new_soviet:green_bricks_2_slab",
"new_soviet:cracked_green_bricks_2_slab",
"new_soviet:mossy_green_bricks_2_slab",
"new_soviet:aquamarine_tiles_slab",
"new_soviet:cracked_aquamarine_tiles_slab",
"new_soviet:mossy_aquamarine_tiles_slab",
"new_soviet:dirty_aquamarine_tiles_slab",
"new_soviet:diorite_bricks_slab",
"new_soviet:cracked_diorite_bricks_slab",
"new_soviet:mossy_diorite_bricks_slab",
"new_soviet:calcite_tiles_slab",
"new_soviet:cracked_calcite_tiles_slab",
"new_soviet:mossy_calcite_tiles_slab",
"new_soviet:dripstone_tiles_slab",
"new_soviet:cracked_dripstone_tiles_slab",
"new_soviet:mossy_dripstone_tiles_slab",
"new_soviet:deepslate_tiles_slab",
"new_soviet:cracked_deepslate_tiles_slab",
"new_soviet:mossy_deepslate_tiles_slab",
"new_soviet:light_blue_tiles_slab",
"new_soviet:cracked_light_blue_tiles_slab",
"new_soviet:mossy_light_blue_tiles_slab",
"new_soviet:variated_light_blue_tiles_slab",
"new_soviet:light_blue_bricks_slab",
"new_soviet:cracked_light_blue_bricks_slab",
"new_soviet:mossy_light_blue_bricks_slab",
"new_soviet:green_white_tiles_slab",
"new_soviet:cracked_green_white_tiles_slab",
"new_soviet:mossy_green_white_tiles_slab",
"new_soviet:tuff_tiles_slab",
"new_soviet:cracked_tuff_tiles_slab",
"new_soviet:mossy_tuff_tiles_slab",
"new_soviet:tuff_bricks_slab",
"new_soviet:cracked_tuff_bricks_slab",
"new_soviet:mossy_tuff_bricks_slab",
"new_soviet:white_concrete_slab",
"new_soviet:cracked_white_concrete_slab",
"new_soviet:beige_concrete_slab",
"new_soviet:cracked_beige_concrete_slab",
"new_soviet:blue_concrete_slab",
"new_soviet:cracked_blue_concrete_slab",
"new_soviet:red_concrete_slab",
"new_soviet:cracked_red_concrete_slab",
"new_soviet:yellow_concrete_slab",
"new_soviet:cracked_yellow_concrete_slab",
"new_soviet:green_concrete_slab",
"new_soviet:cracked_green_concrete_slab",
"new_soviet:nii_floor_slab",
"new_soviet:herringbone_acacia_planks_slab",
"new_soviet:cross_acacia_planks_slab",
"new_soviet:herringbone_oak_planks_slab",
"new_soviet:cross_oak_planks_slab",
"new_soviet:herringbone_birch_planks_slab",
"new_soviet:cross_birch_planks_slab",
"new_soviet:herringbone_crimson_planks_slab",
"new_soviet:cross_crimson_planks_slab",
"new_soviet:herringbone_dark_oak_planks_slab",
"new_soviet:cross_dark_oak_planks_slab",
"new_soviet:herringbone_jungle_planks_slab",
"new_soviet:cross_jungle_planks_slab",
"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:herringbone_parquet_slab",
"new_soviet:straight_parquet_slab",
"new_soviet:separated_parquet_slab",
"new_soviet:green_linoleum_slab",
"new_soviet:blue_linoleum_slab",
"new_soviet:red_linoleum_slab",
"new_soviet:gray_linoleum_slab",
"new_soviet:orange_linoleum_slab",
"new_soviet:brown_linoleum_slab",
"new_soviet:cyan_linoleum_slab"
]
}

106
src/main/generated/data/minecraft/tags/blocks/stairs.json
View file

@ -1,106 +0,0 @@
{
"replace": false,
"values": [
"new_soviet:sand_tiles_stairs",
"new_soviet:cracked_sand_tiles_stairs",
"new_soviet:mossy_sand_tiles_stairs",
"new_soviet:herringbone_sand_tiles_stairs",
"new_soviet:cross_sand_tiles_stairs",
"new_soviet:sand_bricks_stairs",
"new_soviet:cracked_sand_bricks_stairs",
"new_soviet:mossy_sand_bricks_stairs",
"new_soviet:big_sand_bricks_stairs",
"new_soviet:brick_tiles_stairs",
"new_soviet:cracked_brick_tiles_stairs",
"new_soviet:mossy_brick_tiles_stairs",
"new_soviet:dirty_brick_tiles_stairs",
"new_soviet:dark_brick_tiles_stairs",
"new_soviet:cracked_dark_brick_tiles_stairs",
"new_soviet:mossy_dark_brick_tiles_stairs",
"new_soviet:dirty_dark_brick_tiles_stairs",
"new_soviet:red_bricks_stairs",
"new_soviet:cracked_red_bricks_stairs",
"new_soviet:mossy_red_bricks_stairs",
"new_soviet:teal_tiles_stairs",
"new_soviet:cracked_teal_tiles_stairs",
"new_soviet:mossy_teal_tiles_stairs",
"new_soviet:variated_teal_tiles_stairs",
"new_soviet:green_bricks_stairs",
"new_soviet:cracked_green_bricks_stairs",
"new_soviet:mossy_green_bricks_stairs",
"new_soviet:green_bricks_2_stairs",
"new_soviet:cracked_green_bricks_2_stairs",
"new_soviet:mossy_green_bricks_2_stairs",
"new_soviet:aquamarine_tiles_stairs",
"new_soviet:cracked_aquamarine_tiles_stairs",
"new_soviet:mossy_aquamarine_tiles_stairs",
"new_soviet:dirty_aquamarine_tiles_stairs",
"new_soviet:diorite_bricks_stairs",
"new_soviet:cracked_diorite_bricks_stairs",
"new_soviet:mossy_diorite_bricks_stairs",
"new_soviet:calcite_tiles_stairs",
"new_soviet:cracked_calcite_tiles_stairs",
"new_soviet:mossy_calcite_tiles_stairs",
"new_soviet:dripstone_tiles_stairs",
"new_soviet:cracked_dripstone_tiles_stairs",
"new_soviet:mossy_dripstone_tiles_stairs",
"new_soviet:deepslate_tiles_stairs",
"new_soviet:cracked_deepslate_tiles_stairs",
"new_soviet:mossy_deepslate_tiles_stairs",
"new_soviet:light_blue_tiles_stairs",
"new_soviet:cracked_light_blue_tiles_stairs",
"new_soviet:mossy_light_blue_tiles_stairs",
"new_soviet:variated_light_blue_tiles_stairs",
"new_soviet:light_blue_bricks_stairs",
"new_soviet:cracked_light_blue_bricks_stairs",
"new_soviet:mossy_light_blue_bricks_stairs",
"new_soviet:green_white_tiles_stairs",
"new_soviet:cracked_green_white_tiles_stairs",
"new_soviet:mossy_green_white_tiles_stairs",
"new_soviet:tuff_tiles_stairs",
"new_soviet:cracked_tuff_tiles_stairs",
"new_soviet:mossy_tuff_tiles_stairs",
"new_soviet:tuff_bricks_stairs",
"new_soviet:cracked_tuff_bricks_stairs",
"new_soviet:mossy_tuff_bricks_stairs",
"new_soviet:white_concrete_stairs",
"new_soviet:cracked_white_concrete_stairs",
"new_soviet:beige_concrete_stairs",
"new_soviet:cracked_beige_concrete_stairs",
"new_soviet:blue_concrete_stairs",
"new_soviet:cracked_blue_concrete_stairs",
"new_soviet:red_concrete_stairs",
"new_soviet:cracked_red_concrete_stairs",
"new_soviet:yellow_concrete_stairs",
"new_soviet:cracked_yellow_concrete_stairs",
"new_soviet:green_concrete_stairs",
"new_soviet:cracked_green_concrete_stairs",
"new_soviet:nii_floor_stairs",
"new_soviet:herringbone_acacia_planks_stairs",
"new_soviet:cross_acacia_planks_stairs",
"new_soviet:herringbone_oak_planks_stairs",
"new_soviet:cross_oak_planks_stairs",
"new_soviet:herringbone_birch_planks_stairs",
"new_soviet:cross_birch_planks_stairs",
"new_soviet:herringbone_crimson_planks_stairs",
"new_soviet:cross_crimson_planks_stairs",
"new_soviet:herringbone_dark_oak_planks_stairs",
"new_soviet:cross_dark_oak_planks_stairs",
"new_soviet:herringbone_jungle_planks_stairs",
"new_soviet:cross_jungle_planks_stairs",
"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:herringbone_parquet_stairs",
"new_soviet:straight_parquet_stairs",
"new_soviet:separated_parquet_stairs",
"new_soviet:green_linoleum_stairs",
"new_soviet:blue_linoleum_stairs",
"new_soviet:red_linoleum_stairs",
"new_soviet:gray_linoleum_stairs",
"new_soviet:orange_linoleum_stairs",
"new_soviet:brown_linoleum_stairs",
"new_soviet:cyan_linoleum_stairs"
]
}

9
src/main/generated/data/minecraft/tags/blocks/wooden_doors.json
View file

@ -1,9 +0,0 @@
{
"replace": false,
"values": [
"new_soviet:chiseled_birch_door",
"new_soviet:chiseled_oak_door",
"new_soviet:chiseled_mangrove_door",
"new_soviet:chiseled_spruce_door"
]
}

21
src/main/generated/data/minecraft/tags/blocks/wooden_slabs.json
View file

@ -1,21 +0,0 @@
{
"replace": false,
"values": [
"new_soviet:herringbone_acacia_planks_slab",
"new_soviet:cross_acacia_planks_slab",
"new_soviet:herringbone_oak_planks_slab",
"new_soviet:cross_oak_planks_slab",
"new_soviet:herringbone_birch_planks_slab",
"new_soviet:cross_birch_planks_slab",
"new_soviet:herringbone_crimson_planks_slab",
"new_soviet:cross_crimson_planks_slab",
"new_soviet:herringbone_dark_oak_planks_slab",
"new_soviet:cross_dark_oak_planks_slab",
"new_soviet:herringbone_jungle_planks_slab",
"new_soviet:cross_jungle_planks_slab",
"new_soviet:herringbone_mangrove_planks_slab",
"new_soviet:cross_mangrove_planks_slab",
"new_soviet:herringbone_spruce_planks_slab",
"new_soviet:cross_spruce_planks_slab"
]
}

21
src/main/generated/data/minecraft/tags/blocks/wooden_stairs.json
View file

@ -1,21 +0,0 @@
{
"replace": false,
"values": [
"new_soviet:herringbone_acacia_planks_stairs",
"new_soviet:cross_acacia_planks_stairs",
"new_soviet:herringbone_oak_planks_stairs",
"new_soviet:cross_oak_planks_stairs",
"new_soviet:herringbone_birch_planks_stairs",
"new_soviet:cross_birch_planks_stairs",
"new_soviet:herringbone_crimson_planks_stairs",
"new_soviet:cross_crimson_planks_stairs",
"new_soviet:herringbone_dark_oak_planks_stairs",
"new_soviet:cross_dark_oak_planks_stairs",
"new_soviet:herringbone_jungle_planks_stairs",
"new_soviet:cross_jungle_planks_stairs",
"new_soviet:herringbone_mangrove_planks_stairs",
"new_soviet:cross_mangrove_planks_stairs",
"new_soviet:herringbone_spruce_planks_stairs",
"new_soviet:cross_spruce_planks_stairs"
]
}

281
src/main/java/su/a71/new_soviet/DataGeneration.java
View file

@ -715,9 +715,7 @@ public class DataGeneration implements DataGeneratorEntrypoint {
.add(NSE_Blocks.NII_FLOOR_STAIRS) .add(NSE_Blocks.NII_FLOOR_STAIRS)
.add(NSE_Blocks.NII_FLOOR_SLAB) .add(NSE_Blocks.NII_FLOOR_SLAB)
.add(NSE_Blocks.METAL_PLATING_STAIRS) .add(NSE_Blocks.METAL_PLATING_STAIRS)
.add(NSE_Blocks.METAL_PLATING_SLAB) .add(NSE_Blocks.METAL_PLATING_SLAB);
.add(NSE_Custom.VINTAGE_LAMP)
.add(NSE_Custom.LIGHT_BULB_LAMP);
// Blocks mined with an axe // Blocks mined with an axe
getOrCreateTagBuilder(BlockTags.AXE_MINEABLE) getOrCreateTagBuilder(BlockTags.AXE_MINEABLE)
@ -809,288 +807,13 @@ public class DataGeneration implements DataGeneratorEntrypoint {
.add(NSE_Blocks.BROWN_LINOLEUM_STAIRS) .add(NSE_Blocks.BROWN_LINOLEUM_STAIRS)
.add(NSE_Blocks.BROWN_LINOLEUM_SLAB) .add(NSE_Blocks.BROWN_LINOLEUM_SLAB)
.add(NSE_Blocks.CYAN_LINOLEUM_STAIRS) .add(NSE_Blocks.CYAN_LINOLEUM_STAIRS)
.add(NSE_Blocks.CYAN_LINOLEUM_SLAB) .add(NSE_Blocks.CYAN_LINOLEUM_SLAB);
.add(NSE_Custom.TABLE_LAMP);
getOrCreateTagBuilder(NSE_Tags.Blocks.RAKE_MINEABLE) getOrCreateTagBuilder(NSE_Tags.Blocks.RAKE_MINEABLE)
.add(NSE_Blocks.MEAT) .add(NSE_Blocks.MEAT)
.add(NSE_Blocks.MEAT_EYE) .add(NSE_Blocks.MEAT_EYE)
.add(NSE_Blocks.MEAT_TEETH) .add(NSE_Blocks.MEAT_TEETH)
.add(NSE_Blocks.PURPLE_GOO); .add(NSE_Blocks.PURPLE_GOO);
getOrCreateTagBuilder(BlockTags.DOORS)
.add(NSE_Blocks.CHISELED_BIRCH_DOOR)
.add(NSE_Blocks.CHISELED_OAK_DOOR)
.add(NSE_Blocks.CHISELED_MANGROVE_DOOR)
.add(NSE_Blocks.CHISELED_SPRUCE_DOOR);
getOrCreateTagBuilder(BlockTags.WOODEN_DOORS)
.add(NSE_Blocks.CHISELED_BIRCH_DOOR)
.add(NSE_Blocks.CHISELED_OAK_DOOR)
.add(NSE_Blocks.CHISELED_MANGROVE_DOOR)
.add(NSE_Blocks.CHISELED_SPRUCE_DOOR);
getOrCreateTagBuilder(BlockTags.WALLS).add(NSE_Blocks.CONCRETE_WALL);
getOrCreateTagBuilder(BlockTags.PLANKS)
.add(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS)
.add(NSE_Blocks.CROSS_ACACIA_PLANKS)
.add(NSE_Blocks.HERRINGBONE_OAK_PLANKS)
.add(NSE_Blocks.CROSS_OAK_PLANKS)
.add(NSE_Blocks.HERRINGBONE_BIRCH_PLANKS)
.add(NSE_Blocks.CROSS_BIRCH_PLANKS)
.add(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS)
.add(NSE_Blocks.CROSS_CRIMSON_PLANKS)
.add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS)
.add(NSE_Blocks.CROSS_DARK_OAK_PLANKS)
.add(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS)
.add(NSE_Blocks.CROSS_JUNGLE_PLANKS)
.add(NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS)
.add(NSE_Blocks.CROSS_MANGROVE_PLANKS)
.add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS)
.add(NSE_Blocks.CROSS_SPRUCE_PLANKS);
getOrCreateTagBuilder(BlockTags.STAIRS)
.add(NSE_Blocks.SAND_TILES_STAIRS)
.add(NSE_Blocks.CRACKED_SAND_TILES_STAIRS)
.add(NSE_Blocks.MOSSY_SAND_TILES_STAIRS)
.add(NSE_Blocks.HERRINGBONE_SAND_TILES_STAIRS)
.add(NSE_Blocks.CROSS_SAND_TILES_STAIRS)
.add(NSE_Blocks.SAND_BRICKS_STAIRS)
.add(NSE_Blocks.CRACKED_SAND_BRICKS_STAIRS)
.add(NSE_Blocks.MOSSY_SAND_BRICKS_STAIRS)
.add(NSE_Blocks.BIG_SAND_BRICKS_STAIRS)
.add(NSE_Blocks.BRICK_TILES_STAIRS)
.add(NSE_Blocks.CRACKED_BRICK_TILES_STAIRS)
.add(NSE_Blocks.MOSSY_BRICK_TILES_STAIRS)
.add(NSE_Blocks.DIRTY_BRICK_TILES_STAIRS)
.add(NSE_Blocks.DARK_BRICK_TILES_STAIRS)
.add(NSE_Blocks.CRACKED_DARK_BRICK_TILES_STAIRS)
.add(NSE_Blocks.MOSSY_DARK_BRICK_TILES_STAIRS)
.add(NSE_Blocks.DIRTY_DARK_BRICK_TILES_STAIRS)
.add(NSE_Blocks.RED_BRICKS_STAIRS)
.add(NSE_Blocks.CRACKED_RED_BRICKS_STAIRS)
.add(NSE_Blocks.MOSSY_RED_BRICKS_STAIRS)
.add(NSE_Blocks.TEAL_TILES_STAIRS)
.add(NSE_Blocks.CRACKED_TEAL_TILES_STAIRS)
.add(NSE_Blocks.MOSSY_TEAL_TILES_STAIRS)
.add(NSE_Blocks.VARIATED_TEAL_TILES_STAIRS)
.add(NSE_Blocks.GREEN_BRICKS_STAIRS)
.add(NSE_Blocks.CRACKED_GREEN_BRICKS_STAIRS)
.add(NSE_Blocks.MOSSY_GREEN_BRICKS_STAIRS)
.add(NSE_Blocks.GREEN_BRICKS_2_STAIRS)
.add(NSE_Blocks.CRACKED_GREEN_BRICKS_2_STAIRS)
.add(NSE_Blocks.MOSSY_GREEN_BRICKS_2_STAIRS)
.add(NSE_Blocks.AQUAMARINE_TILES_STAIRS)
.add(NSE_Blocks.CRACKED_AQUAMARINE_TILES_STAIRS)
.add(NSE_Blocks.MOSSY_AQUAMARINE_TILES_STAIRS)
.add(NSE_Blocks.DIRTY_AQUAMARINE_TILES_STAIRS)
.add(NSE_Blocks.DIORITE_BRICKS_STAIRS)
.add(NSE_Blocks.CRACKED_DIORITE_BRICKS_STAIRS)
.add(NSE_Blocks.MOSSY_DIORITE_BRICKS_STAIRS)
.add(NSE_Blocks.CALCITE_TILES_STAIRS)
.add(NSE_Blocks.CRACKED_CALCITE_TILES_STAIRS)
.add(NSE_Blocks.MOSSY_CALCITE_TILES_STAIRS)
.add(NSE_Blocks.DRIPSTONE_TILES_STAIRS)
.add(NSE_Blocks.CRACKED_DRIPSTONE_TILES_STAIRS)
.add(NSE_Blocks.MOSSY_DRIPSTONE_TILES_STAIRS)
.add(NSE_Blocks.DEEPSLATE_TILES_STAIRS)
.add(NSE_Blocks.CRACKED_DEEPSLATE_TILES_STAIRS)
.add(NSE_Blocks.MOSSY_DEEPSLATE_TILES_STAIRS)
.add(NSE_Blocks.LIGHT_BLUE_TILES_STAIRS)
.add(NSE_Blocks.CRACKED_LIGHT_BLUE_TILES_STAIRS)
.add(NSE_Blocks.MOSSY_LIGHT_BLUE_TILES_STAIRS)
.add(NSE_Blocks.VARIATED_LIGHT_BLUE_TILES_STAIRS)
.add(NSE_Blocks.LIGHT_BLUE_BRICKS_STAIRS)
.add(NSE_Blocks.CRACKED_LIGHT_BLUE_BRICKS_STAIRS)
.add(NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS_STAIRS)
.add(NSE_Blocks.GREEN_WHITE_TILES_STAIRS)
.add(NSE_Blocks.CRACKED_GREEN_WHITE_TILES_STAIRS)
.add(NSE_Blocks.MOSSY_GREEN_WHITE_TILES_STAIRS)
.add(NSE_Blocks.TUFF_TILES_STAIRS)
.add(NSE_Blocks.CRACKED_TUFF_TILES_STAIRS)
.add(NSE_Blocks.MOSSY_TUFF_TILES_STAIRS)
.add(NSE_Blocks.TUFF_BRICKS_STAIRS)
.add(NSE_Blocks.CRACKED_TUFF_BRICKS_STAIRS)
.add(NSE_Blocks.MOSSY_TUFF_BRICKS_STAIRS)
.add(NSE_Blocks.WHITE_CONCRETE_STAIRS)
.add(NSE_Blocks.CRACKED_WHITE_CONCRETE_STAIRS)
.add(NSE_Blocks.BEIGE_CONCRETE_STAIRS)
.add(NSE_Blocks.CRACKED_BEIGE_CONCRETE_STAIRS)
.add(NSE_Blocks.BLUE_CONCRETE_STAIRS)
.add(NSE_Blocks.CRACKED_BLUE_CONCRETE_STAIRS)
.add(NSE_Blocks.RED_CONCRETE_STAIRS)
.add(NSE_Blocks.CRACKED_RED_CONCRETE_STAIRS)
.add(NSE_Blocks.YELLOW_CONCRETE_STAIRS)
.add(NSE_Blocks.CRACKED_YELLOW_CONCRETE_STAIRS)
.add(NSE_Blocks.GREEN_CONCRETE_STAIRS)
.add(NSE_Blocks.CRACKED_GREEN_CONCRETE_STAIRS)
.add(NSE_Blocks.NII_FLOOR_STAIRS)
.add(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_STAIRS)
.add(NSE_Blocks.CROSS_ACACIA_PLANKS_STAIRS)
.add(NSE_Blocks.HERRINGBONE_OAK_PLANKS_STAIRS)
.add(NSE_Blocks.CROSS_OAK_PLANKS_STAIRS)
.add(NSE_Blocks.HERRINGBONE_BIRCH_PLANKS_STAIRS)
.add(NSE_Blocks.CROSS_BIRCH_PLANKS_STAIRS)
.add(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_STAIRS)
.add(NSE_Blocks.CROSS_CRIMSON_PLANKS_STAIRS)
.add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_STAIRS)
.add(NSE_Blocks.CROSS_DARK_OAK_PLANKS_STAIRS)
.add(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_STAIRS)
.add(NSE_Blocks.CROSS_JUNGLE_PLANKS_STAIRS)
.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.HERRINGBONE_PARQUET_STAIRS)
.add(NSE_Blocks.STRAIGHT_PARQUET_STAIRS)
.add(NSE_Blocks.SEPARATED_PARQUET_STAIRS)
.add(NSE_Blocks.GREEN_LINOLEUM_STAIRS)
.add(NSE_Blocks.BLUE_LINOLEUM_STAIRS)
.add(NSE_Blocks.RED_LINOLEUM_STAIRS)
.add(NSE_Blocks.GRAY_LINOLEUM_STAIRS)
.add(NSE_Blocks.ORANGE_LINOLEUM_STAIRS)
.add(NSE_Blocks.BROWN_LINOLEUM_STAIRS)
.add(NSE_Blocks.CYAN_LINOLEUM_STAIRS);
getOrCreateTagBuilder(BlockTags.SLABS)
.add(NSE_Blocks.SAND_TILES_SLAB)
.add(NSE_Blocks.CRACKED_SAND_TILES_SLAB)
.add(NSE_Blocks.MOSSY_SAND_TILES_SLAB)
.add(NSE_Blocks.HERRINGBONE_SAND_TILES_SLAB)
.add(NSE_Blocks.CROSS_SAND_TILES_SLAB)
.add(NSE_Blocks.SAND_BRICKS_SLAB)
.add(NSE_Blocks.CRACKED_SAND_BRICKS_SLAB)
.add(NSE_Blocks.MOSSY_SAND_BRICKS_SLAB)
.add(NSE_Blocks.BIG_SAND_BRICKS_SLAB)
.add(NSE_Blocks.BRICK_TILES_SLAB)
.add(NSE_Blocks.CRACKED_BRICK_TILES_SLAB)
.add(NSE_Blocks.MOSSY_BRICK_TILES_SLAB)
.add(NSE_Blocks.DIRTY_BRICK_TILES_SLAB)
.add(NSE_Blocks.DARK_BRICK_TILES_SLAB)
.add(NSE_Blocks.CRACKED_DARK_BRICK_TILES_SLAB)
.add(NSE_Blocks.MOSSY_DARK_BRICK_TILES_SLAB)
.add(NSE_Blocks.DIRTY_DARK_BRICK_TILES_SLAB)
.add(NSE_Blocks.RED_BRICKS_SLAB)
.add(NSE_Blocks.CRACKED_RED_BRICKS_SLAB)
.add(NSE_Blocks.MOSSY_RED_BRICKS_SLAB)
.add(NSE_Blocks.TEAL_TILES_SLAB)
.add(NSE_Blocks.CRACKED_TEAL_TILES_SLAB)
.add(NSE_Blocks.MOSSY_TEAL_TILES_SLAB)
.add(NSE_Blocks.VARIATED_TEAL_TILES_SLAB)
.add(NSE_Blocks.GREEN_BRICKS_SLAB)
.add(NSE_Blocks.CRACKED_GREEN_BRICKS_SLAB)
.add(NSE_Blocks.MOSSY_GREEN_BRICKS_SLAB)
.add(NSE_Blocks.GREEN_BRICKS_2_SLAB)
.add(NSE_Blocks.CRACKED_GREEN_BRICKS_2_SLAB)
.add(NSE_Blocks.MOSSY_GREEN_BRICKS_2_SLAB)
.add(NSE_Blocks.AQUAMARINE_TILES_SLAB)
.add(NSE_Blocks.CRACKED_AQUAMARINE_TILES_SLAB)
.add(NSE_Blocks.MOSSY_AQUAMARINE_TILES_SLAB)
.add(NSE_Blocks.DIRTY_AQUAMARINE_TILES_SLAB)
.add(NSE_Blocks.DIORITE_BRICKS_SLAB)
.add(NSE_Blocks.CRACKED_DIORITE_BRICKS_SLAB)
.add(NSE_Blocks.MOSSY_DIORITE_BRICKS_SLAB)
.add(NSE_Blocks.CALCITE_TILES_SLAB)
.add(NSE_Blocks.CRACKED_CALCITE_TILES_SLAB)
.add(NSE_Blocks.MOSSY_CALCITE_TILES_SLAB)
.add(NSE_Blocks.DRIPSTONE_TILES_SLAB)
.add(NSE_Blocks.CRACKED_DRIPSTONE_TILES_SLAB)
.add(NSE_Blocks.MOSSY_DRIPSTONE_TILES_SLAB)
.add(NSE_Blocks.DEEPSLATE_TILES_SLAB)
.add(NSE_Blocks.CRACKED_DEEPSLATE_TILES_SLAB)
.add(NSE_Blocks.MOSSY_DEEPSLATE_TILES_SLAB)
.add(NSE_Blocks.LIGHT_BLUE_TILES_SLAB)
.add(NSE_Blocks.CRACKED_LIGHT_BLUE_TILES_SLAB)
.add(NSE_Blocks.MOSSY_LIGHT_BLUE_TILES_SLAB)
.add(NSE_Blocks.VARIATED_LIGHT_BLUE_TILES_SLAB)
.add(NSE_Blocks.LIGHT_BLUE_BRICKS_SLAB)
.add(NSE_Blocks.CRACKED_LIGHT_BLUE_BRICKS_SLAB)
.add(NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS_SLAB)
.add(NSE_Blocks.GREEN_WHITE_TILES_SLAB)
.add(NSE_Blocks.CRACKED_GREEN_WHITE_TILES_SLAB)
.add(NSE_Blocks.MOSSY_GREEN_WHITE_TILES_SLAB)
.add(NSE_Blocks.TUFF_TILES_SLAB)
.add(NSE_Blocks.CRACKED_TUFF_TILES_SLAB)
.add(NSE_Blocks.MOSSY_TUFF_TILES_SLAB)
.add(NSE_Blocks.TUFF_BRICKS_SLAB)
.add(NSE_Blocks.CRACKED_TUFF_BRICKS_SLAB)
.add(NSE_Blocks.MOSSY_TUFF_BRICKS_SLAB)
.add(NSE_Blocks.WHITE_CONCRETE_SLAB)
.add(NSE_Blocks.CRACKED_WHITE_CONCRETE_SLAB)
.add(NSE_Blocks.BEIGE_CONCRETE_SLAB)
.add(NSE_Blocks.CRACKED_BEIGE_CONCRETE_SLAB)
.add(NSE_Blocks.BLUE_CONCRETE_SLAB)
.add(NSE_Blocks.CRACKED_BLUE_CONCRETE_SLAB)
.add(NSE_Blocks.RED_CONCRETE_SLAB)
.add(NSE_Blocks.CRACKED_RED_CONCRETE_SLAB)
.add(NSE_Blocks.YELLOW_CONCRETE_SLAB)
.add(NSE_Blocks.CRACKED_YELLOW_CONCRETE_SLAB)
.add(NSE_Blocks.GREEN_CONCRETE_SLAB)
.add(NSE_Blocks.CRACKED_GREEN_CONCRETE_SLAB)
.add(NSE_Blocks.NII_FLOOR_SLAB)
.add(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_SLAB)
.add(NSE_Blocks.CROSS_ACACIA_PLANKS_SLAB)
.add(NSE_Blocks.HERRINGBONE_OAK_PLANKS_SLAB)
.add(NSE_Blocks.CROSS_OAK_PLANKS_SLAB)
.add(NSE_Blocks.HERRINGBONE_BIRCH_PLANKS_SLAB)
.add(NSE_Blocks.CROSS_BIRCH_PLANKS_SLAB)
.add(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_SLAB)
.add(NSE_Blocks.CROSS_CRIMSON_PLANKS_SLAB)
.add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_SLAB)
.add(NSE_Blocks.CROSS_DARK_OAK_PLANKS_SLAB)
.add(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_SLAB)
.add(NSE_Blocks.CROSS_JUNGLE_PLANKS_SLAB)
.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.HERRINGBONE_PARQUET_SLAB)
.add(NSE_Blocks.STRAIGHT_PARQUET_SLAB)
.add(NSE_Blocks.SEPARATED_PARQUET_SLAB)
.add(NSE_Blocks.GREEN_LINOLEUM_SLAB)
.add(NSE_Blocks.BLUE_LINOLEUM_SLAB)
.add(NSE_Blocks.RED_LINOLEUM_SLAB)
.add(NSE_Blocks.GRAY_LINOLEUM_SLAB)
.add(NSE_Blocks.ORANGE_LINOLEUM_SLAB)
.add(NSE_Blocks.BROWN_LINOLEUM_SLAB)
.add(NSE_Blocks.CYAN_LINOLEUM_SLAB);
getOrCreateTagBuilder(BlockTags.WOODEN_STAIRS)
.add(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_STAIRS)
.add(NSE_Blocks.CROSS_ACACIA_PLANKS_STAIRS)
.add(NSE_Blocks.HERRINGBONE_OAK_PLANKS_STAIRS)
.add(NSE_Blocks.CROSS_OAK_PLANKS_STAIRS)
.add(NSE_Blocks.HERRINGBONE_BIRCH_PLANKS_STAIRS)
.add(NSE_Blocks.CROSS_BIRCH_PLANKS_STAIRS)
.add(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_STAIRS)
.add(NSE_Blocks.CROSS_CRIMSON_PLANKS_STAIRS)
.add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_STAIRS)
.add(NSE_Blocks.CROSS_DARK_OAK_PLANKS_STAIRS)
.add(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_STAIRS)
.add(NSE_Blocks.CROSS_JUNGLE_PLANKS_STAIRS)
.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);
getOrCreateTagBuilder(BlockTags.WOODEN_SLABS)
.add(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_SLAB)
.add(NSE_Blocks.CROSS_ACACIA_PLANKS_SLAB)
.add(NSE_Blocks.HERRINGBONE_OAK_PLANKS_SLAB)
.add(NSE_Blocks.CROSS_OAK_PLANKS_SLAB)
.add(NSE_Blocks.HERRINGBONE_BIRCH_PLANKS_SLAB)
.add(NSE_Blocks.CROSS_BIRCH_PLANKS_SLAB)
.add(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_SLAB)
.add(NSE_Blocks.CROSS_CRIMSON_PLANKS_SLAB)
.add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_SLAB)
.add(NSE_Blocks.CROSS_DARK_OAK_PLANKS_SLAB)
.add(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_SLAB)
.add(NSE_Blocks.CROSS_JUNGLE_PLANKS_SLAB)
.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);
} }
} }

7
src/main/java/su/a71/new_soviet/registration/NSE_Custom.java
View file

@ -12,6 +12,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.registry.Registries; import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry; import net.minecraft.registry.Registry;
import net.minecraft.sound.BlockSoundGroup; import net.minecraft.sound.BlockSoundGroup;
import net.minecraft.sound.SoundEvent;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import net.minecraft.util.DyeColor; import net.minecraft.util.DyeColor;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
@ -30,9 +31,9 @@ public class NSE_Custom extends NSE_BaseRegistration {
public static final RadioReceiverBlock RADIO_RECEIVER = new RadioReceiverBlock(); public static final RadioReceiverBlock RADIO_RECEIVER = new RadioReceiverBlock();
public static final SwitchBlock SWITCH = new SwitchBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).notSolid().pistonBehavior(PistonBehavior.DESTROY).strength(1f, 2f).mapColor(MapColor.TERRACOTTA_WHITE)); public static final SwitchBlock SWITCH = new SwitchBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).notSolid().pistonBehavior(PistonBehavior.DESTROY).strength(1f, 2f).mapColor(MapColor.TERRACOTTA_WHITE));
public static final TableLampBlock TABLE_LAMP = new TableLampBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD).strength(0.9f, 1.5f).mapColor(MapColor.WHITE)); public static final TableLampBlock TABLE_LAMP = new TableLampBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.LANTERN).strength(1f, 1.5f).mapColor(MapColor.WHITE));
public static final TableLampBlock VINTAGE_LAMP = new VintageLampBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).strength(0.9f, 1.5f).mapColor(MapColor.WHITE)); public static final TableLampBlock VINTAGE_LAMP = new VintageLampBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.LANTERN).strength(1f, 1.5f).mapColor(MapColor.WHITE));
public static final LightBulbLampBlock LIGHT_BULB_LAMP = new LightBulbLampBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.GLASS).strength(0.9f, 1.5f).mapColor(MapColor.WHITE).requiresTool()); public static final LightBulbLampBlock LIGHT_BULB_LAMP = new LightBulbLampBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.GLASS).strength(1f, 1.5f).mapColor(MapColor.WHITE));
public static final CeilingFanBlock CEILING_FAN = new CeilingFanBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).strength(1f, 1.5f).mapColor(MapColor.WHITE)); public static final CeilingFanBlock CEILING_FAN = new CeilingFanBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).strength(1f, 1.5f).mapColor(MapColor.WHITE));

1
src/main/generated/data/minecraft/tags/blocks/walls.json → src/main/resources/data/minecraft/tags/blocks/walls.json
View file

@ -1,5 +1,4 @@
{ {
"replace": false,
"values": [ "values": [
"new_soviet:concrete_wall" "new_soviet:concrete_wall"
] ]