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

Add missing planks

Browse source
This commit is contained in:
Andrew-71 2023-10-22 14:49:42 +03:00
parent 24e5854d8c
commit 6fb9c51fde
86 changed files with 1728 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/su/a71/new_soviet/blocks/TVBlock.java
View file

@ -141,7 +141,10 @@ public class TVBlock extends HorizontalFacingBlock implements BlockEntityProvide
}
static {
SHAPE = new Shapes.HorizontalShapeLegacy(List.of(List.of(0.0, 0.0, 2.0, 16.0, 13.0, 13.0), List.of(6.0, 13.0, 7.0, 10.0, 13.5, 9.0)));
SHAPE = new Shapes.HorizontalShapeLegacy(List.of(
List.of(0.0, 0.0, 2.0, 16.0, 13.0, 13.0),
List.of(6.0, 13.0, 7.0, 10.0, 13.5, 9.0),
List.of(3.0, 2.0, 13.0, 13.0, 9.0, 15.0)));
ON = RedstoneTorchBlock.LIT;
WATERLOGGED = Properties.WATERLOGGED;
BROKEN = Properties.CRACKED;

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

@ -210,6 +210,9 @@ public class BlockLootTables extends FabricBlockLootTableProvider {
addDrop(NSE_Blocks.YELLOW_BOUNDARY_MARKER);
addDrop(NSE_Blocks.RED_BOUNDARY_MARKER);
addDrop(NSE_Blocks.ORANGE_BOUNDARY_MARKER);
addDrop(NSE_Blocks.CROSS_CHERRY_PLANKS);
addDrop(NSE_Blocks.HERRINGBONE_CHERRY_PLANKS);
addDrop(NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS);
// Drops for furniture/electronics/appliances
addDrop(NSE_Custom.WHITE_PAWN);
@ -441,6 +444,12 @@ public class BlockLootTables extends FabricBlockLootTableProvider {
addDrop(NSE_Blocks.CYAN_LINOLEUM_STAIRS);
addDrop(NSE_Blocks.METAL_PLATING_SLAB);
addDrop(NSE_Blocks.METAL_PLATING_STAIRS);
addDrop(NSE_Blocks.HERRINGBONE_CHERRY_PLANKS_SLAB);
addDrop(NSE_Blocks.CROSS_CHERRY_PLANKS_STAIRS);
addDrop(NSE_Blocks.CROSS_CHERRY_PLANKS_SLAB);
addDrop(NSE_Blocks.HERRINGBONE_CHERRY_PLANKS_STAIRS);
addDrop(NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS_SLAB);
addDrop(NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS_STAIRS);
addDrop(NSE_Blocks.BARBED_WIRE, dropSilkAndNot(Items.IRON_NUGGET, NSE_Blocks.BARBED_WIRE));
addDrop(NSE_Blocks.DIRT_ROAD, dropSilkAndNot(Blocks.DIRT, NSE_Blocks.DIRT_ROAD));

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

@ -401,7 +401,16 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider {
.add(NSE_Blocks.BROWN_LINOLEUM_SLAB)
.add(NSE_Blocks.CYAN_LINOLEUM_STAIRS)
.add(NSE_Blocks.CYAN_LINOLEUM_SLAB)
.add(NSE_Custom.TABLE_LAMP);
.add(NSE_Custom.TABLE_LAMP)
.add(NSE_Blocks.CROSS_CHERRY_PLANKS)
.add(NSE_Blocks.CROSS_CHERRY_PLANKS_STAIRS)
.add(NSE_Blocks.CROSS_CHERRY_PLANKS_SLAB)
.add(NSE_Blocks.HERRINGBONE_CHERRY_PLANKS_STAIRS)
.add(NSE_Blocks.HERRINGBONE_CHERRY_PLANKS_SLAB)
.add(NSE_Blocks.HERRINGBONE_CHERRY_PLANKS)
.add(NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS_STAIRS)
.add(NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS_SLAB)
.add(NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS);
getOrCreateTagBuilder(NSE_Tags.Blocks.RAKE_MINEABLE)
.add(NSE_Blocks.MEAT)
@ -456,7 +465,10 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider {
.add(NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS)
.add(NSE_Blocks.CROSS_MANGROVE_PLANKS)
.add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS)
.add(NSE_Blocks.CROSS_SPRUCE_PLANKS);
.add(NSE_Blocks.CROSS_SPRUCE_PLANKS)
.add(NSE_Blocks.CROSS_CHERRY_PLANKS)
.add(NSE_Blocks.HERRINGBONE_CHERRY_PLANKS)
.add(NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS);
getOrCreateTagBuilder(BlockTags.STAIRS)
.add(NSE_Blocks.SAND_TILES_STAIRS)
@ -560,7 +572,10 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider {
.add(NSE_Blocks.ORANGE_LINOLEUM_STAIRS)
.add(NSE_Blocks.BROWN_LINOLEUM_STAIRS)
.add(NSE_Blocks.CYAN_LINOLEUM_STAIRS)
.add(NSE_Blocks.METAL_PLATING_STAIRS);
.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);
getOrCreateTagBuilder(BlockTags.SLABS)
.add(NSE_Blocks.SAND_TILES_SLAB)
@ -664,7 +679,10 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider {
.add(NSE_Blocks.ORANGE_LINOLEUM_SLAB)
.add(NSE_Blocks.BROWN_LINOLEUM_SLAB)
.add(NSE_Blocks.CYAN_LINOLEUM_SLAB)
.add(NSE_Blocks.METAL_PLATING_SLAB);
.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);
getOrCreateTagBuilder(BlockTags.WOODEN_STAIRS)
.add(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_STAIRS)
@ -682,7 +700,10 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider {
.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.CROSS_SPRUCE_PLANKS_STAIRS)
.add(NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS_STAIRS)
.add(NSE_Blocks.CROSS_CHERRY_PLANKS_STAIRS)
.add(NSE_Blocks.HERRINGBONE_CHERRY_PLANKS_STAIRS);
getOrCreateTagBuilder(BlockTags.WOODEN_SLABS)
.add(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_SLAB)
@ -700,7 +721,10 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider {
.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.CROSS_SPRUCE_PLANKS_SLAB)
.add(NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS_SLAB)
.add(NSE_Blocks.CROSS_CHERRY_PLANKS_SLAB)
.add(NSE_Blocks.HERRINGBONE_CHERRY_PLANKS_SLAB);
getOrCreateTagBuilder(NSE_Tags.Blocks.BOUNDARY_MARKERS)
.add(NSE_Blocks.BLUE_BOUNDARY_MARKER)

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

@ -201,6 +201,10 @@ public class ModelGenerator extends FabricModelProvider {
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.CROSS_MANGROVE_PLANKS, NSE_Blocks.CROSS_MANGROVE_PLANKS_STAIRS, NSE_Blocks.CROSS_MANGROVE_PLANKS_SLAB, "floor/planks");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS, NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_SLAB, "floor/planks");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.CROSS_SPRUCE_PLANKS, NSE_Blocks.CROSS_SPRUCE_PLANKS_STAIRS, NSE_Blocks.CROSS_SPRUCE_PLANKS_SLAB, "floor/planks");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.HERRINGBONE_CHERRY_PLANKS, NSE_Blocks.HERRINGBONE_CHERRY_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_CHERRY_PLANKS_SLAB, "floor/planks");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.CROSS_CHERRY_PLANKS, NSE_Blocks.CROSS_CHERRY_PLANKS_STAIRS, NSE_Blocks.CROSS_CHERRY_PLANKS_SLAB, "floor/planks");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS, NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS_SLAB, "floor/planks");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.HERRINGBONE_PARQUET, NSE_Blocks.HERRINGBONE_PARQUET_STAIRS, NSE_Blocks.HERRINGBONE_PARQUET_SLAB, "floor/planks");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.STRAIGHT_PARQUET, NSE_Blocks.STRAIGHT_PARQUET_STAIRS, NSE_Blocks.STRAIGHT_PARQUET_SLAB, "floor/planks");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.SEPARATED_PARQUET, NSE_Blocks.SEPARATED_PARQUET_STAIRS, NSE_Blocks.SEPARATED_PARQUET_SLAB, "floor/planks");

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

@ -718,6 +718,9 @@ public class RecipeGenerator extends FabricRecipeProvider {
offerStairsAndSlab(exporter, NSE_Blocks.BROWN_LINOLEUM_STAIRS, NSE_Blocks.BROWN_LINOLEUM_SLAB, NSE_Blocks.BROWN_LINOLEUM);
offerStairsAndSlab(exporter, NSE_Blocks.CYAN_LINOLEUM_STAIRS, NSE_Blocks.CYAN_LINOLEUM_SLAB, NSE_Blocks.CYAN_LINOLEUM);
offerStairsAndSlab(exporter, NSE_Blocks.METAL_PLATING_STAIRS, NSE_Blocks.METAL_PLATING_SLAB, NSE_Blocks.METAL_PLATING);
offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_CHERRY_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_CHERRY_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_CHERRY_PLANKS);
offerStairsAndSlab(exporter, NSE_Blocks.CROSS_CHERRY_PLANKS_STAIRS, NSE_Blocks.CROSS_CHERRY_PLANKS_SLAB, NSE_Blocks.CROSS_CHERRY_PLANKS);
offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_BAMBOO_PLANKS);
offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.WHITE_BOUNDARY_MARKER, Blocks.DIORITE_WALL, 1);
offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.WHITE_BOUNDARY_MARKER, Blocks.BONE_BLOCK, 2);

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

@ -363,6 +363,15 @@ public class NSE_Blocks extends NSE_BaseRegistration {
public static final Block CROSS_SPRUCE_PLANKS = new Block(FabricBlockSettings.copy(Blocks.SPRUCE_PLANKS));
public static final StairsBlock CROSS_SPRUCE_PLANKS_STAIRS = new StairsBlock(CROSS_SPRUCE_PLANKS.getDefaultState(), FabricBlockSettings.copy(CROSS_SPRUCE_PLANKS));
public static final SlabBlock CROSS_SPRUCE_PLANKS_SLAB = new SlabBlock(FabricBlockSettings.copy(CROSS_SPRUCE_PLANKS));
public static final Block HERRINGBONE_CHERRY_PLANKS = new Block(FabricBlockSettings.copy(Blocks.CHERRY_PLANKS));
public static final StairsBlock HERRINGBONE_CHERRY_PLANKS_STAIRS = new StairsBlock(HERRINGBONE_CHERRY_PLANKS.getDefaultState(), FabricBlockSettings.copy(HERRINGBONE_SPRUCE_PLANKS));
public static final SlabBlock HERRINGBONE_CHERRY_PLANKS_SLAB = new SlabBlock(FabricBlockSettings.copy(HERRINGBONE_CHERRY_PLANKS));
public static final Block CROSS_CHERRY_PLANKS = new Block(FabricBlockSettings.copy(Blocks.CHERRY_PLANKS));
public static final StairsBlock CROSS_CHERRY_PLANKS_STAIRS = new StairsBlock(CROSS_CHERRY_PLANKS.getDefaultState(), FabricBlockSettings.copy(CROSS_CHERRY_PLANKS));
public static final SlabBlock CROSS_CHERRY_PLANKS_SLAB = new SlabBlock(FabricBlockSettings.copy(CROSS_CHERRY_PLANKS));
public static final Block HERRINGBONE_BAMBOO_PLANKS = new Block(FabricBlockSettings.copy(Blocks.BAMBOO_PLANKS));
public static final StairsBlock HERRINGBONE_BAMBOO_PLANKS_STAIRS = new StairsBlock(HERRINGBONE_BAMBOO_PLANKS.getDefaultState(), FabricBlockSettings.copy(HERRINGBONE_BAMBOO_PLANKS));
public static final SlabBlock HERRINGBONE_BAMBOO_PLANKS_SLAB = new SlabBlock(FabricBlockSettings.copy(HERRINGBONE_BAMBOO_PLANKS));
public static final Block HERRINGBONE_PARQUET = new Block(FabricBlockSettings.create().sounds(NSE_Sounds.PARQUET_SOUNDS).strength(2f, 3f).mapColor(MapColor.OAK_TAN));
public static final StairsBlock HERRINGBONE_PARQUET_STAIRS = new StairsBlock(HERRINGBONE_PARQUET.getDefaultState(), FabricBlockSettings.copy(HERRINGBONE_PARQUET));
@ -815,7 +824,15 @@ public class NSE_Blocks extends NSE_BaseRegistration {
registerBlock("cross_spruce_planks", () -> CROSS_SPRUCE_PLANKS, NSE_BUILDING_TAB);
registerBlock("cross_spruce_planks_stairs", () -> CROSS_SPRUCE_PLANKS_STAIRS, NSE_BUILDING_TAB);
registerBlock("cross_spruce_planks_slab", () -> CROSS_SPRUCE_PLANKS_SLAB, NSE_BUILDING_TAB);
// TODO: Cherry!!!
registerBlock("herringbone_cherry_planks", () -> HERRINGBONE_CHERRY_PLANKS, NSE_BUILDING_TAB);
registerBlock("herringbone_cherry_planks_stairs", () -> HERRINGBONE_CHERRY_PLANKS_STAIRS, NSE_BUILDING_TAB);
registerBlock("herringbone_cherry_planks_slab", () -> HERRINGBONE_CHERRY_PLANKS_SLAB, NSE_BUILDING_TAB);
registerBlock("cross_cherry_planks", () -> CROSS_CHERRY_PLANKS, NSE_BUILDING_TAB);
registerBlock("cross_cherry_planks_stairs", () -> CROSS_CHERRY_PLANKS_STAIRS, NSE_BUILDING_TAB);
registerBlock("cross_cherry_planks_slab", () -> CROSS_CHERRY_PLANKS_SLAB, NSE_BUILDING_TAB);
registerBlock("herringbone_bamboo_planks", () -> HERRINGBONE_BAMBOO_PLANKS, NSE_BUILDING_TAB);
registerBlock("herringbone_bamboo_planks_stairs", () -> HERRINGBONE_BAMBOO_PLANKS_STAIRS, NSE_BUILDING_TAB);
registerBlock("herringbone_bamboo_planks_slab", () -> HERRINGBONE_BAMBOO_PLANKS_SLAB, NSE_BUILDING_TAB);
registerBlock("herringbone_parquet", () -> HERRINGBONE_PARQUET, NSE_BUILDING_TAB);
registerBlock("herringbone_parquet_stairs", () -> HERRINGBONE_PARQUET_STAIRS, NSE_BUILDING_TAB);
@ -930,6 +947,9 @@ public class NSE_Blocks extends NSE_BaseRegistration {
flammableBlockRegistry.add(CROSS_MANGROVE_PLANKS, 20, 5);
flammableBlockRegistry.add(HERRINGBONE_SPRUCE_PLANKS, 20, 5);
flammableBlockRegistry.add(CROSS_SPRUCE_PLANKS, 20, 5);
flammableBlockRegistry.add(HERRINGBONE_CHERRY_PLANKS, 20, 5);
flammableBlockRegistry.add(CROSS_CHERRY_PLANKS, 20, 5);
flammableBlockRegistry.add(HERRINGBONE_BAMBOO_PLANKS, 20, 5);
flammableBlockRegistry.add(HERRINGBONE_PARQUET, 20, 5);
flammableBlockRegistry.add(STRAIGHT_PARQUET, 20, 5);
@ -973,12 +993,20 @@ public class NSE_Blocks extends NSE_BaseRegistration {
flammableBlockRegistry.add(HERRINGBONE_SPRUCE_PLANKS_SLAB, 20, 5);
flammableBlockRegistry.add(CROSS_SPRUCE_PLANKS_STAIRS, 20, 5);
flammableBlockRegistry.add(CROSS_SPRUCE_PLANKS_SLAB, 20, 5);
flammableBlockRegistry.add(HERRINGBONE_CHERRY_PLANKS, 20, 5);
flammableBlockRegistry.add(HERRINGBONE_CHERRY_PLANKS, 20, 5);
flammableBlockRegistry.add(CROSS_CHERRY_PLANKS, 20, 5);
flammableBlockRegistry.add(CROSS_CHERRY_PLANKS, 20, 5);
flammableBlockRegistry.add(HERRINGBONE_BAMBOO_PLANKS, 20, 5);
flammableBlockRegistry.add(HERRINGBONE_BAMBOO_PLANKS, 20, 5);
flammableBlockRegistry.add(HERRINGBONE_PARQUET_STAIRS, 20, 5);
flammableBlockRegistry.add(HERRINGBONE_PARQUET_SLAB, 20, 5);
flammableBlockRegistry.add(STRAIGHT_PARQUET_STAIRS, 20, 5);
flammableBlockRegistry.add(STRAIGHT_PARQUET_SLAB, 20, 5);
flammableBlockRegistry.add(SEPARATED_PARQUET_STAIRS, 20, 5);
flammableBlockRegistry.add(SEPARATED_PARQUET_SLAB, 20, 5);
flammableBlockRegistry.add(GREEN_LINOLEUM_STAIRS, 20, 5);
flammableBlockRegistry.add(GREEN_LINOLEUM_SLAB, 20, 5);
flammableBlockRegistry.add(BLUE_LINOLEUM_STAIRS, 20, 5);