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

Mostly add new concrete

Browse source
This commit is contained in:
Andrew-71 2023-12-26 20:55:17 +03:00
parent a72c3a427c
commit 2498105304
231 changed files with 4940 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java
View file

@ -165,18 +165,33 @@ public class BlockLootTables extends FabricBlockLootTableProvider {
addDrop(NSE_Blocks.CYAN_LINOLEUM);
addDrop(NSE_Blocks.CROSS_ORANGE_LINOLEUM);
addDrop(NSE_Blocks.CROSS_BROWN_LINOLEUM);
addDrop(NSE_Blocks.CONCRETE);
addDrop(NSE_Blocks.CONCRETE_WITH_BARS);
addDrop(NSE_Blocks.CRACKED_CONCRETE);
addDrop(NSE_Blocks.WHITE_CONCRETE);
addDrop(NSE_Blocks.WHITE_CONCRETE_WITH_BARS);
addDrop(NSE_Blocks.CRACKED_WHITE_CONCRETE);
addDrop(NSE_Blocks.BEIGE_CONCRETE);
addDrop(NSE_Blocks.BEIGE_CONCRETE_WITH_BARS);
addDrop(NSE_Blocks.CRACKED_BEIGE_CONCRETE);
addDrop(NSE_Blocks.BLUE_CONCRETE);
addDrop(NSE_Blocks.BLUE_CONCRETE_WITH_BARS);
addDrop(NSE_Blocks.CRACKED_BLUE_CONCRETE);
addDrop(NSE_Blocks.RED_CONCRETE);
addDrop(NSE_Blocks.RED_CONCRETE_WITH_BARS);
addDrop(NSE_Blocks.CRACKED_RED_CONCRETE);
addDrop(NSE_Blocks.YELLOW_CONCRETE);
addDrop(NSE_Blocks.YELLOW_CONCRETE_WITH_BARS);
addDrop(NSE_Blocks.CRACKED_YELLOW_CONCRETE);
addDrop(NSE_Blocks.GREEN_CONCRETE);
addDrop(NSE_Blocks.GREEN_CONCRETE_WITH_BARS);
addDrop(NSE_Blocks.CRACKED_GREEN_CONCRETE);
addDrop(NSE_Blocks.DARK_GREEN_CONCRETE);
addDrop(NSE_Blocks.DARK_GREEN_CONCRETE_WITH_BARS);
addDrop(NSE_Blocks.CRACKED_DARK_GREEN_CONCRETE);
addDrop(NSE_Blocks.ORANGE_CONCRETE);
addDrop(NSE_Blocks.ORANGE_CONCRETE_WITH_BARS);
addDrop(NSE_Blocks.CRACKED_ORANGE_CONCRETE);
addDrop(NSE_Blocks.WHITEWASH);
addDrop(NSE_Blocks.CRACKED_WHITEWASH);
addDrop(NSE_Blocks.VERY_CRACKED_WHITEWASH);
@ -366,6 +381,10 @@ public class BlockLootTables extends FabricBlockLootTableProvider {
addDrop(NSE_Blocks.CRACKED_TUFF_BRICKS_STAIRS);
addDrop(NSE_Blocks.MOSSY_TUFF_BRICKS_SLAB);
addDrop(NSE_Blocks.MOSSY_TUFF_BRICKS_STAIRS);
addDrop(NSE_Blocks.CONCRETE_SLAB);
addDrop(NSE_Blocks.CONCRETE_STAIRS);
addDrop(NSE_Blocks.CRACKED_CONCRETE_SLAB);
addDrop(NSE_Blocks.CRACKED_CONCRETE_STAIRS);
addDrop(NSE_Blocks.WHITE_CONCRETE_SLAB);
addDrop(NSE_Blocks.WHITE_CONCRETE_STAIRS);
addDrop(NSE_Blocks.CRACKED_WHITE_CONCRETE_SLAB);
@ -390,6 +409,14 @@ public class BlockLootTables extends FabricBlockLootTableProvider {
addDrop(NSE_Blocks.GREEN_CONCRETE_STAIRS);
addDrop(NSE_Blocks.CRACKED_GREEN_CONCRETE_SLAB);
addDrop(NSE_Blocks.CRACKED_GREEN_CONCRETE_STAIRS);
addDrop(NSE_Blocks.DARK_GREEN_CONCRETE_SLAB);
addDrop(NSE_Blocks.DARK_GREEN_CONCRETE_STAIRS);
addDrop(NSE_Blocks.CRACKED_DARK_GREEN_CONCRETE_SLAB);
addDrop(NSE_Blocks.CRACKED_DARK_GREEN_CONCRETE_STAIRS);
addDrop(NSE_Blocks.ORANGE_CONCRETE_SLAB);
addDrop(NSE_Blocks.ORANGE_CONCRETE_STAIRS);
addDrop(NSE_Blocks.CRACKED_ORANGE_CONCRETE_SLAB);
addDrop(NSE_Blocks.CRACKED_ORANGE_CONCRETE_STAIRS);
addDrop(NSE_Blocks.NII_FLOOR_SLAB);
addDrop(NSE_Blocks.NII_FLOOR_STAIRS);
addDrop(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_SLAB);

45
src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java
View file

@ -308,7 +308,38 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider {
.add(NSE_Blocks.LIME_BOUNDARY_MARKER)
.add(NSE_Blocks.YELLOW_BOUNDARY_MARKER)
.add(NSE_Blocks.RED_BOUNDARY_MARKER)
.add(NSE_Blocks.ORANGE_BOUNDARY_MARKER);
.add(NSE_Blocks.ORANGE_BOUNDARY_MARKER)
.add(NSE_Blocks.CONCRETE)
.add(NSE_Blocks.CONCRETE_WITH_BARS)
.add(NSE_Blocks.CONCRETE_STAIRS)
.add(NSE_Blocks.CONCRETE_SLAB)
.add(NSE_Blocks.CRACKED_CONCRETE_STAIRS)
.add(NSE_Blocks.CRACKED_CONCRETE_SLAB)
.add(NSE_Blocks.DARK_GREEN_CONCRETE)
.add(NSE_Blocks.DARK_GREEN_CONCRETE_WITH_BARS)
.add(NSE_Blocks.DARK_GREEN_CONCRETE_STAIRS)
.add(NSE_Blocks.DARK_GREEN_CONCRETE_SLAB)
.add(NSE_Blocks.CRACKED_DARK_GREEN_CONCRETE_STAIRS)
.add(NSE_Blocks.CRACKED_DARK_GREEN_CONCRETE_SLAB)
.add(NSE_Blocks.ORANGE_CONCRETE)
.add(NSE_Blocks.ORANGE_CONCRETE_WITH_BARS)
.add(NSE_Blocks.ORANGE_CONCRETE_STAIRS)
.add(NSE_Blocks.ORANGE_CONCRETE_SLAB)
.add(NSE_Blocks.CRACKED_ORANGE_CONCRETE_STAIRS)
.add(NSE_Blocks.CRACKED_ORANGE_CONCRETE_SLAB)
.add(NSE_Blocks.WHITE_CONCRETE)
.add(NSE_Blocks.WHITE_CONCRETE_WITH_BARS)
.add(NSE_Blocks.BEIGE_CONCRETE)
.add(NSE_Blocks.BEIGE_CONCRETE_WITH_BARS)
.add(NSE_Blocks.BLUE_CONCRETE)
.add(NSE_Blocks.BLUE_CONCRETE_WITH_BARS)
.add(NSE_Blocks.GREEN_CONCRETE)
.add(NSE_Blocks.GREEN_CONCRETE)
.add(NSE_Blocks.RED_CONCRETE)
.add(NSE_Blocks.RED_CONCRETE_WITH_BARS)
.add(NSE_Blocks.YELLOW_CONCRETE)
.add(NSE_Blocks.YELLOW_CONCRETE_WITH_BARS)
;
// Blocks mined with an axe
getOrCreateTagBuilder(BlockTags.AXE_MINEABLE)
@ -584,7 +615,11 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider {
.add(NSE_Blocks.METAL_PLATING_STAIRS)
.add(NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS_STAIRS)
.add(NSE_Blocks.CROSS_CHERRY_PLANKS_STAIRS)
.add(NSE_Blocks.HERRINGBONE_CHERRY_PLANKS_STAIRS);
.add(NSE_Blocks.HERRINGBONE_CHERRY_PLANKS_STAIRS)
.add(NSE_Blocks.CONCRETE_STAIRS)
.add(NSE_Blocks.DARK_GREEN_CONCRETE_STAIRS)
.add(NSE_Blocks.ORANGE_CONCRETE_STAIRS)
;
getOrCreateTagBuilder(BlockTags.SLABS)
.add(NSE_Blocks.SAND_TILES_SLAB)
@ -693,7 +728,11 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider {
.add(NSE_Blocks.METAL_PLATING_SLAB)
.add(NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS_SLAB)
.add(NSE_Blocks.CROSS_CHERRY_PLANKS_SLAB)
.add(NSE_Blocks.HERRINGBONE_CHERRY_PLANKS_SLAB);
.add(NSE_Blocks.HERRINGBONE_CHERRY_PLANKS_SLAB)
.add(NSE_Blocks.CONCRETE_SLAB)
.add(NSE_Blocks.DARK_GREEN_CONCRETE_SLAB)
.add(NSE_Blocks.ORANGE_CONCRETE_SLAB)
;
getOrCreateTagBuilder(BlockTags.WOODEN_STAIRS)
.add(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_STAIRS)

6
src/main/java/su/a71/new_soviet/datagen/ModelGenerator.java
View file

@ -171,6 +171,8 @@ public class ModelGenerator extends FabricModelProvider {
registerCube(blockStateModelGenerator, NSE_Blocks.WHITEWASH, "whitewash");
registerCube(blockStateModelGenerator, NSE_Blocks.CRACKED_WHITEWASH, "whitewash");
registerCube(blockStateModelGenerator, NSE_Blocks.VERY_CRACKED_WHITEWASH, "whitewash");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.CONCRETE, NSE_Blocks.CONCRETE_STAIRS, NSE_Blocks.CONCRETE_SLAB, "concrete");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.CRACKED_CONCRETE, NSE_Blocks.CRACKED_CONCRETE_STAIRS, NSE_Blocks.CRACKED_CONCRETE_SLAB, "concrete");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.WHITE_CONCRETE, NSE_Blocks.WHITE_CONCRETE_STAIRS, NSE_Blocks.WHITE_CONCRETE_SLAB, "concrete");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.CRACKED_WHITE_CONCRETE, NSE_Blocks.CRACKED_WHITE_CONCRETE_STAIRS, NSE_Blocks.CRACKED_WHITE_CONCRETE_SLAB, "concrete");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.BEIGE_CONCRETE, NSE_Blocks.BEIGE_CONCRETE_STAIRS, NSE_Blocks.BEIGE_CONCRETE_SLAB, "concrete");
@ -183,6 +185,10 @@ public class ModelGenerator extends FabricModelProvider {
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.CRACKED_YELLOW_CONCRETE, NSE_Blocks.CRACKED_YELLOW_CONCRETE_STAIRS, NSE_Blocks.CRACKED_YELLOW_CONCRETE_SLAB, "concrete");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.GREEN_CONCRETE, NSE_Blocks.GREEN_CONCRETE_STAIRS, NSE_Blocks.GREEN_CONCRETE_SLAB, "concrete");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.CRACKED_GREEN_CONCRETE, NSE_Blocks.CRACKED_GREEN_CONCRETE_STAIRS, NSE_Blocks.CRACKED_GREEN_CONCRETE_SLAB, "concrete");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.DARK_GREEN_CONCRETE, NSE_Blocks.DARK_GREEN_CONCRETE_STAIRS, NSE_Blocks.DARK_GREEN_CONCRETE_SLAB, "concrete");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.CRACKED_DARK_GREEN_CONCRETE, NSE_Blocks.CRACKED_DARK_GREEN_CONCRETE_STAIRS, NSE_Blocks.CRACKED_DARK_GREEN_CONCRETE_SLAB, "concrete");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.ORANGE_CONCRETE, NSE_Blocks.ORANGE_CONCRETE_STAIRS, NSE_Blocks.ORANGE_CONCRETE_SLAB, "concrete");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.CRACKED_ORANGE_CONCRETE, NSE_Blocks.CRACKED_ORANGE_CONCRETE_STAIRS, NSE_Blocks.CRACKED_ORANGE_CONCRETE_SLAB, "concrete");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.NII_FLOOR, NSE_Blocks.NII_FLOOR_STAIRS, NSE_Blocks.NII_FLOOR_SLAB, "research_institute");
registerCube(blockStateModelGenerator, NSE_Blocks.DIRT_ROAD, "floor");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.HERRINGBONE_ACACIA_PLANKS, NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_SLAB, "floor/planks");

39
src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java
View file

@ -128,6 +128,17 @@ public class RecipeGenerator extends FabricRecipeProvider {
}
private void concreteRecipe(Consumer<RecipeJsonProvider> exporter, ItemConvertible output, ItemConvertible dye) {
if (dye == null) { // Base concrete gives 2 more but requires an extra iron bar
ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, output, 8)
.input('B', Blocks.IRON_BARS).input('S', Blocks.STONE)
.pattern("SBS")
.pattern(" B ")
.pattern("SBS")
.criterion(hasItem(Blocks.IRON_BARS), conditionsFromItem(Blocks.IRON_BARS))
.criterion(hasItem(Blocks.STONE), conditionsFromItem(Blocks.STONE))
.offerTo(exporter);
return;
}
ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, output, 6)
.input('D', dye).input('B', Blocks.IRON_BARS).input('S', Blocks.STONE)
.pattern("SBS")
@ -736,6 +747,8 @@ public class RecipeGenerator extends FabricRecipeProvider {
offerStairsAndSlab(exporter, NSE_Blocks.TUFF_BRICKS_STAIRS, NSE_Blocks.TUFF_BRICKS_SLAB, NSE_Blocks.TUFF_BRICKS);
offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_TUFF_BRICKS_STAIRS, NSE_Blocks.CRACKED_TUFF_BRICKS_SLAB, NSE_Blocks.CRACKED_TUFF_BRICKS);
offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_TUFF_BRICKS_STAIRS, NSE_Blocks.MOSSY_TUFF_BRICKS_SLAB, NSE_Blocks.MOSSY_TUFF_BRICKS);
offerStairsAndSlab(exporter, NSE_Blocks.CONCRETE_STAIRS, NSE_Blocks.CONCRETE_SLAB, NSE_Blocks.CONCRETE);
offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_CONCRETE_STAIRS, NSE_Blocks.CRACKED_CONCRETE_SLAB, NSE_Blocks.CRACKED_CONCRETE);
offerStairsAndSlab(exporter, NSE_Blocks.WHITE_CONCRETE_STAIRS, NSE_Blocks.WHITE_CONCRETE_SLAB, NSE_Blocks.WHITE_CONCRETE);
offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_WHITE_CONCRETE_STAIRS, NSE_Blocks.CRACKED_WHITE_CONCRETE_SLAB, NSE_Blocks.CRACKED_WHITE_CONCRETE);
offerStairsAndSlab(exporter, NSE_Blocks.BEIGE_CONCRETE_STAIRS, NSE_Blocks.BEIGE_CONCRETE_SLAB, NSE_Blocks.BEIGE_CONCRETE);
@ -748,6 +761,10 @@ public class RecipeGenerator extends FabricRecipeProvider {
offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_YELLOW_CONCRETE_STAIRS, NSE_Blocks.CRACKED_YELLOW_CONCRETE_SLAB, NSE_Blocks.CRACKED_YELLOW_CONCRETE);
offerStairsAndSlab(exporter, NSE_Blocks.GREEN_CONCRETE_STAIRS, NSE_Blocks.GREEN_CONCRETE_SLAB, NSE_Blocks.GREEN_CONCRETE);
offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_GREEN_CONCRETE_STAIRS, NSE_Blocks.CRACKED_GREEN_CONCRETE_SLAB, NSE_Blocks.CRACKED_GREEN_CONCRETE);
offerStairsAndSlab(exporter, NSE_Blocks.DARK_GREEN_CONCRETE_STAIRS, NSE_Blocks.DARK_GREEN_CONCRETE_SLAB, NSE_Blocks.DARK_GREEN_CONCRETE);
offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_DARK_GREEN_CONCRETE_STAIRS, NSE_Blocks.CRACKED_DARK_GREEN_CONCRETE_SLAB, NSE_Blocks.CRACKED_DARK_GREEN_CONCRETE);
offerStairsAndSlab(exporter, NSE_Blocks.ORANGE_CONCRETE_STAIRS, NSE_Blocks.ORANGE_CONCRETE_SLAB, NSE_Blocks.ORANGE_CONCRETE);
offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_ORANGE_CONCRETE_STAIRS, NSE_Blocks.CRACKED_ORANGE_CONCRETE_SLAB, NSE_Blocks.CRACKED_ORANGE_CONCRETE);
offerStairsAndSlab(exporter, NSE_Blocks.NII_FLOOR_STAIRS, NSE_Blocks.NII_FLOOR_SLAB, NSE_Blocks.NII_FLOOR);
offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_ACACIA_PLANKS);
offerStairsAndSlab(exporter, NSE_Blocks.CROSS_ACACIA_PLANKS_STAIRS, NSE_Blocks.CROSS_ACACIA_PLANKS_SLAB, NSE_Blocks.CROSS_ACACIA_PLANKS);
@ -803,18 +820,32 @@ public class RecipeGenerator extends FabricRecipeProvider {
"warning_stripes");
offerDyeableRecipes(exporter,
List.of(Items.GREEN_DYE, Items.YELLOW_DYE, Items.BLUE_DYE, Items.RED_DYE, Items.WHITE_DYE, Items.LIGHT_GRAY_DYE),
List.of(Items.LIME_DYE, Items.YELLOW_DYE, Items.BLUE_DYE, Items.RED_DYE, Items.WHITE_DYE, Items.LIGHT_GRAY_DYE,
Items.GREEN_DYE, Items.ORANGE_DYE),
List.of(NSE_Blocks.GREEN_CONCRETE.asItem(), NSE_Blocks.YELLOW_CONCRETE.asItem(), NSE_Blocks.BLUE_CONCRETE.asItem(),
NSE_Blocks.RED_CONCRETE.asItem(), NSE_Blocks.WHITE_CONCRETE.asItem(), NSE_Blocks.BEIGE_CONCRETE.asItem()),
NSE_Blocks.RED_CONCRETE.asItem(), NSE_Blocks.WHITE_CONCRETE.asItem(), NSE_Blocks.BEIGE_CONCRETE.asItem(),
NSE_Blocks.DARK_GREEN_CONCRETE.asItem(), NSE_Blocks.ORANGE_CONCRETE.asItem()),
"concrete");
concreteRecipe(exporter, NSE_Blocks.GREEN_CONCRETE, Items.GREEN_DYE);
offerDyeableRecipes(exporter,
List.of(Items.LIME_DYE, Items.YELLOW_DYE, Items.BLUE_DYE, Items.RED_DYE, Items.WHITE_DYE, Items.LIGHT_GRAY_DYE,
Items.GREEN_DYE, Items.ORANGE_DYE),
List.of(NSE_Blocks.CRACKED_GREEN_CONCRETE.asItem(), NSE_Blocks.CRACKED_YELLOW_CONCRETE.asItem(), NSE_Blocks.CRACKED_BLUE_CONCRETE.asItem(),
NSE_Blocks.CRACKED_RED_CONCRETE.asItem(), NSE_Blocks.CRACKED_WHITE_CONCRETE.asItem(), NSE_Blocks.CRACKED_BEIGE_CONCRETE.asItem(),
NSE_Blocks.CRACKED_DARK_GREEN_CONCRETE.asItem(), NSE_Blocks.CRACKED_ORANGE_CONCRETE.asItem()),
"concrete_cracked");
concreteRecipe(exporter, NSE_Blocks.CONCRETE, null);
concreteRecipe(exporter, NSE_Blocks.GREEN_CONCRETE, Items.LIME_DYE);
concreteRecipe(exporter, NSE_Blocks.DARK_GREEN_CONCRETE, Items.GREEN_DYE);
concreteRecipe(exporter, NSE_Blocks.YELLOW_CONCRETE, Items.YELLOW_DYE);
concreteRecipe(exporter, NSE_Blocks.ORANGE_CONCRETE, Items.ORANGE_DYE);
concreteRecipe(exporter, NSE_Blocks.BLUE_CONCRETE, Items.BLUE_DYE);
concreteRecipe(exporter, NSE_Blocks.RED_CONCRETE, Items.RED_DYE);
concreteRecipe(exporter, NSE_Blocks.WHITE_CONCRETE, Items.WHITE_DYE);
concreteRecipe(exporter, NSE_Blocks.BEIGE_CONCRETE, Items.LIGHT_GRAY_DYE);
concreteWithBarsRecipe(exporter, NSE_Blocks.CONCRETE_WITH_BARS, NSE_Blocks.CRACKED_CONCRETE);
concreteWithBarsRecipe(exporter, NSE_Blocks.DARK_GREEN_CONCRETE_WITH_BARS, NSE_Blocks.CRACKED_DARK_GREEN_CONCRETE);
concreteWithBarsRecipe(exporter, NSE_Blocks.GREEN_CONCRETE_WITH_BARS, NSE_Blocks.CRACKED_GREEN_CONCRETE);
concreteWithBarsRecipe(exporter, NSE_Blocks.ORANGE_CONCRETE_WITH_BARS, NSE_Blocks.CRACKED_ORANGE_CONCRETE);
concreteWithBarsRecipe(exporter, NSE_Blocks.YELLOW_CONCRETE_WITH_BARS, NSE_Blocks.CRACKED_YELLOW_CONCRETE);
concreteWithBarsRecipe(exporter, NSE_Blocks.BLUE_CONCRETE_WITH_BARS, NSE_Blocks.CRACKED_BLUE_CONCRETE);
concreteWithBarsRecipe(exporter, NSE_Blocks.RED_CONCRETE_WITH_BARS, NSE_Blocks.CRACKED_RED_CONCRETE);

51
src/main/java/su/a71/new_soviet/registration/NSE_Blocks.java
View file

@ -269,6 +269,14 @@ public class NSE_Blocks extends NSE_BaseRegistration {
public static final Block CRACKED_WHITEWASH = new Block(FabricBlockSettings.copy(WHITEWASH));
public static final Block VERY_CRACKED_WHITEWASH = new Block(FabricBlockSettings.copy(WHITEWASH));
// CONCRETE =======================
public static final Block CONCRETE = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).strength(1.5f, 6f).requiresTool().mapColor(MapColor.STONE_GRAY));
public static final StairsBlock CONCRETE_STAIRS = new StairsBlock(CONCRETE.getDefaultState(), FabricBlockSettings.copy(CONCRETE));
public static final SlabBlock CONCRETE_SLAB = new SlabBlock(FabricBlockSettings.copy(CONCRETE));
public static final Block CRACKED_CONCRETE = new Block(FabricBlockSettings.copy(CONCRETE));
public static final StairsBlock CRACKED_CONCRETE_STAIRS = new StairsBlock(CRACKED_CONCRETE.getDefaultState(), FabricBlockSettings.copy(CRACKED_CONCRETE));
public static final SlabBlock CRACKED_CONCRETE_SLAB = new SlabBlock(FabricBlockSettings.copy(CRACKED_CONCRETE));
public static final ConcreteWithBarsBlock CONCRETE_WITH_BARS = new ConcreteWithBarsBlock(FabricBlockSettings.copy(CONCRETE));
public static final Block WHITE_CONCRETE = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).strength(1.5f, 6f).requiresTool().mapColor(MapColor.OFF_WHITE));
public static final StairsBlock WHITE_CONCRETE_STAIRS = new StairsBlock(WHITE_CONCRETE.getDefaultState(), FabricBlockSettings.copy(WHITE_CONCRETE));
public static final SlabBlock WHITE_CONCRETE_SLAB = new SlabBlock(FabricBlockSettings.copy(WHITE_CONCRETE));
@ -311,6 +319,20 @@ public class NSE_Blocks extends NSE_BaseRegistration {
public static final StairsBlock CRACKED_GREEN_CONCRETE_STAIRS = new StairsBlock(CRACKED_GREEN_CONCRETE.getDefaultState(), FabricBlockSettings.copy(CRACKED_GREEN_CONCRETE));
public static final SlabBlock CRACKED_GREEN_CONCRETE_SLAB = new SlabBlock(FabricBlockSettings.copy(CRACKED_GREEN_CONCRETE));
public static final ConcreteWithBarsBlock GREEN_CONCRETE_WITH_BARS = new ConcreteWithBarsBlock(FabricBlockSettings.copy(GREEN_CONCRETE));
public static final Block DARK_GREEN_CONCRETE = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).strength(1.5f, 6f).requiresTool().mapColor(MapColor.DARK_GREEN));
public static final StairsBlock DARK_GREEN_CONCRETE_STAIRS = new StairsBlock(DARK_GREEN_CONCRETE.getDefaultState(), FabricBlockSettings.copy(DARK_GREEN_CONCRETE));
public static final SlabBlock DARK_GREEN_CONCRETE_SLAB = new SlabBlock(FabricBlockSettings.copy(DARK_GREEN_CONCRETE));
public static final Block CRACKED_DARK_GREEN_CONCRETE = new Block(FabricBlockSettings.copy(DARK_GREEN_CONCRETE));
public static final StairsBlock CRACKED_DARK_GREEN_CONCRETE_STAIRS = new StairsBlock(CRACKED_DARK_GREEN_CONCRETE.getDefaultState(), FabricBlockSettings.copy(CRACKED_DARK_GREEN_CONCRETE));
public static final SlabBlock CRACKED_DARK_GREEN_CONCRETE_SLAB = new SlabBlock(FabricBlockSettings.copy(CRACKED_DARK_GREEN_CONCRETE));
public static final ConcreteWithBarsBlock DARK_GREEN_CONCRETE_WITH_BARS = new ConcreteWithBarsBlock(FabricBlockSettings.copy(DARK_GREEN_CONCRETE));
public static final Block ORANGE_CONCRETE = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).strength(1.5f, 6f).requiresTool().mapColor(MapColor.STONE_GRAY));
public static final StairsBlock ORANGE_CONCRETE_STAIRS = new StairsBlock(ORANGE_CONCRETE.getDefaultState(), FabricBlockSettings.copy(ORANGE_CONCRETE));
public static final SlabBlock ORANGE_CONCRETE_SLAB = new SlabBlock(FabricBlockSettings.copy(ORANGE_CONCRETE));
public static final Block CRACKED_ORANGE_CONCRETE = new Block(FabricBlockSettings.copy(ORANGE_CONCRETE));
public static final StairsBlock CRACKED_ORANGE_CONCRETE_STAIRS = new StairsBlock(CRACKED_ORANGE_CONCRETE.getDefaultState(), FabricBlockSettings.copy(CRACKED_ORANGE_CONCRETE));
public static final SlabBlock CRACKED_ORANGE_CONCRETE_SLAB = new SlabBlock(FabricBlockSettings.copy(CRACKED_ORANGE_CONCRETE));
public static final ConcreteWithBarsBlock ORANGE_CONCRETE_WITH_BARS = new ConcreteWithBarsBlock(FabricBlockSettings.copy(ORANGE_CONCRETE));
public static final GravelBlock DIRT_ROAD = new GravelBlock(FabricBlockSettings.copy(Blocks.GRAVEL));
@ -389,6 +411,7 @@ public class NSE_Blocks extends NSE_BaseRegistration {
public static final StairsBlock SEPARATED_PARQUET_STAIRS = new StairsBlock(SEPARATED_PARQUET.getDefaultState(), FabricBlockSettings.copy(SEPARATED_PARQUET));
public static final SlabBlock SEPARATED_PARQUET_SLAB = new SlabBlock(FabricBlockSettings.copy(SEPARATED_PARQUET));
// LINOLEUM =======================
public static final Block GREEN_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.CHERRY_WOOD).strength(2, 3f).mapColor(MapColor.TERRACOTTA_GREEN));
public static final StairsBlock GREEN_LINOLEUM_STAIRS = new StairsBlock(GREEN_LINOLEUM.getDefaultState(), FabricBlockSettings.copy(GREEN_LINOLEUM));
public static final SlabBlock GREEN_LINOLEUM_SLAB = new SlabBlock(FabricBlockSettings.copy(GREEN_LINOLEUM));
@ -422,6 +445,7 @@ public class NSE_Blocks extends NSE_BaseRegistration {
public static final StairsBlock NII_FLOOR_STAIRS = new StairsBlock(NII_FLOOR.getDefaultState(), FabricBlockSettings.copy(NII_FLOOR));
public static final SlabBlock NII_FLOOR_SLAB = new SlabBlock(FabricBlockSettings.copy(NII_FLOOR));
// Boundary markers
public static final Block WHITE_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).hardness(1.5f).resistance(4f).requiresTool().mapColor(MapColor.WHITE));
public static final Block LIGHT_GRAY_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.copy(WHITE_BOUNDARY_MARKER).mapColor(MapColor.LIGHT_GRAY));
public static final Block GRAY_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.copy(WHITE_BOUNDARY_MARKER).mapColor(MapColor.GRAY));
@ -439,7 +463,7 @@ public class NSE_Blocks extends NSE_BaseRegistration {
public static final Block MAGENTA_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.copy(WHITE_BOUNDARY_MARKER).mapColor(MapColor.MAGENTA));
public static final Block PURPLE_BOUNDARY_MARKER = new BoundaryMarkerBlock(FabricBlockSettings.copy(WHITE_BOUNDARY_MARKER).mapColor(MapColor.PURPLE));
// Industrial ==========
// Industrial =====================
public static final Block INDUSTRIAL_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).hardness(4f).resistance(6f).requiresTool().mapColor(MapColor.BLACK));
public static final Block RED_WARNING = new Block(FabricBlockSettings.copy(INDUSTRIAL_WARNING).mapColor(MapColor.RED));
public static final Block ORANGE_WARNING = new Block(FabricBlockSettings.copy(INDUSTRIAL_WARNING).mapColor(MapColor.ORANGE));
@ -466,12 +490,12 @@ public class NSE_Blocks extends NSE_BaseRegistration {
public static final PaneBlock RUSTY_BLUE_IRON_BARS = new PaneBlock(FabricBlockSettings.copy(BLUE_IRON_BARS));
public static final PaneBlock VINTAGE_IRON_BARS = new PaneBlock(FabricBlockSettings.copy(Blocks.IRON_BARS));
// WALLPAPER BLOCKS ==========
// WALLPAPER BLOCKS ===============
public static final Block GREEN_WALLPAPER = new Block(FabricBlockSettings.create().sounds(NSE_Sounds.WALLPAPER_BLOCK_SOUNDS).mapColor(MapColor.DARK_GREEN).hardness(10f));
public static final Block BROWN_WALLPAPER = new Block(FabricBlockSettings.copy(GREEN_WALLPAPER).mapColor(MapColor.BROWN));
public static final Block BEIGE_WALLPAPER = new Block(FabricBlockSettings.copy(GREEN_WALLPAPER).mapColor(MapColor.DIRT_BROWN));
// MEAT (cursed...) ==========
// MEAT (cursed...) ===============
public static final Block MEAT = new Block(FabricBlockSettings.create().velocityMultiplier(0.8f).sounds(NSE_Sounds.MEAT_SOUNDS).mapColor(MapColor.DARK_RED).hardness(8f));
public static final Block MEAT_EYE = new Block(FabricBlockSettings.copy(MEAT));
public static final Block MEAT_TEETH = new Block(FabricBlockSettings.copy(MEAT));
@ -733,6 +757,13 @@ public class NSE_Blocks extends NSE_BaseRegistration {
registerBlock("cracked_whitewash", () -> CRACKED_WHITEWASH, NSE_BUILDING_TAB);
registerBlock("very_cracked_whitewash", () -> VERY_CRACKED_WHITEWASH, NSE_BUILDING_TAB);
registerBlock("concrete", () -> CONCRETE, NSE_BUILDING_TAB);
registerBlock("concrete_stairs", () -> CONCRETE_STAIRS, NSE_BUILDING_TAB);
registerBlock("concrete_slab", () -> CONCRETE_SLAB, NSE_BUILDING_TAB);
registerBlock("cracked_concrete", () -> CRACKED_CONCRETE, NSE_BUILDING_TAB);
registerBlock("cracked_concrete_stairs", () -> CRACKED_CONCRETE_STAIRS, NSE_BUILDING_TAB);
registerBlock("cracked_concrete_slab", () -> CRACKED_CONCRETE_SLAB, NSE_BUILDING_TAB);
registerBlock("concrete_with_bars", () -> CONCRETE_WITH_BARS, NSE_BUILDING_TAB);
registerBlock("white_concrete", () -> WHITE_CONCRETE, NSE_BUILDING_TAB);
registerBlock("white_concrete_stairs", () -> WHITE_CONCRETE_STAIRS, NSE_BUILDING_TAB);
registerBlock("white_concrete_slab", () -> WHITE_CONCRETE_SLAB, NSE_BUILDING_TAB);
@ -775,6 +806,20 @@ public class NSE_Blocks extends NSE_BaseRegistration {
registerBlock("cracked_green_concrete_stairs", () -> CRACKED_GREEN_CONCRETE_STAIRS, NSE_BUILDING_TAB);
registerBlock("cracked_green_concrete_slab", () -> CRACKED_GREEN_CONCRETE_SLAB, NSE_BUILDING_TAB);
registerBlock("green_concrete_with_bars", () -> GREEN_CONCRETE_WITH_BARS, NSE_BUILDING_TAB);
registerBlock("dark_green_concrete", () -> DARK_GREEN_CONCRETE, NSE_BUILDING_TAB);
registerBlock("dark_green_concrete_stairs", () -> DARK_GREEN_CONCRETE_STAIRS, NSE_BUILDING_TAB);
registerBlock("dark_green_concrete_slab", () -> DARK_GREEN_CONCRETE_SLAB, NSE_BUILDING_TAB);
registerBlock("cracked_dark_green_concrete", () -> CRACKED_DARK_GREEN_CONCRETE, NSE_BUILDING_TAB);
registerBlock("cracked_dark_green_concrete_stairs", () -> CRACKED_DARK_GREEN_CONCRETE_STAIRS, NSE_BUILDING_TAB);
registerBlock("cracked_dark_green_concrete_slab", () -> CRACKED_DARK_GREEN_CONCRETE_SLAB, NSE_BUILDING_TAB);
registerBlock("dark_green_concrete_with_bars", () -> DARK_GREEN_CONCRETE_WITH_BARS, NSE_BUILDING_TAB);
registerBlock("orange_concrete", () -> ORANGE_CONCRETE, NSE_BUILDING_TAB);
registerBlock("orange_concrete_stairs", () -> ORANGE_CONCRETE_STAIRS, NSE_BUILDING_TAB);
registerBlock("orange_concrete_slab", () -> ORANGE_CONCRETE_SLAB, NSE_BUILDING_TAB);
registerBlock("cracked_orange_concrete", () -> CRACKED_ORANGE_CONCRETE, NSE_BUILDING_TAB);
registerBlock("cracked_orange_concrete_stairs", () -> CRACKED_ORANGE_CONCRETE_STAIRS, NSE_BUILDING_TAB);
registerBlock("cracked_orange_concrete_slab", () -> CRACKED_ORANGE_CONCRETE_SLAB, NSE_BUILDING_TAB);
registerBlock("orange_concrete_with_bars", () -> ORANGE_CONCRETE_WITH_BARS, NSE_BUILDING_TAB);
registerBlock("nii_floor", () -> NII_FLOOR, NSE_BUILDING_TAB);
registerBlock("nii_floor_stairs", () -> NII_FLOOR_STAIRS, NSE_BUILDING_TAB);