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

Add warped planks

Browse source
This commit is contained in:
Andrew-71 2023-10-23 20:36:23 +03:00
parent 95d822babd
commit 113f5117b1
73 changed files with 1398 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -143,6 +143,8 @@ public class BlockLootTables extends FabricBlockLootTableProvider {
addDrop(NSE_Blocks.CROSS_BIRCH_PLANKS);
addDrop(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS);
addDrop(NSE_Blocks.CROSS_CRIMSON_PLANKS);
addDrop(NSE_Blocks.HERRINGBONE_WARPED_PLANKS);
addDrop(NSE_Blocks.CROSS_WARPED_PLANKS);
addDrop(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS);
addDrop(NSE_Blocks.CROSS_DARK_OAK_PLANKS);
addDrop(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS);
@ -406,6 +408,10 @@ public class BlockLootTables extends FabricBlockLootTableProvider {
addDrop(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_STAIRS);
addDrop(NSE_Blocks.CROSS_CRIMSON_PLANKS_SLAB);
addDrop(NSE_Blocks.CROSS_CRIMSON_PLANKS_STAIRS);
addDrop(NSE_Blocks.HERRINGBONE_WARPED_PLANKS_SLAB);
addDrop(NSE_Blocks.HERRINGBONE_WARPED_PLANKS_STAIRS);
addDrop(NSE_Blocks.CROSS_WARPED_PLANKS_SLAB);
addDrop(NSE_Blocks.CROSS_WARPED_PLANKS_STAIRS);
addDrop(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_SLAB);
addDrop(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_STAIRS);
addDrop(NSE_Blocks.CROSS_DARK_OAK_PLANKS_SLAB);

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

@ -322,6 +322,8 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider {
.add(NSE_Blocks.CROSS_BIRCH_PLANKS)
.add(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS)
.add(NSE_Blocks.CROSS_CRIMSON_PLANKS)
.add(NSE_Blocks.HERRINGBONE_WARPED_PLANKS)
.add(NSE_Blocks.CROSS_WARPED_PLANKS)
.add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS)
.add(NSE_Blocks.CROSS_DARK_OAK_PLANKS)
.add(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS)
@ -365,6 +367,10 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider {
.add(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_SLAB)
.add(NSE_Blocks.CROSS_CRIMSON_PLANKS_STAIRS)
.add(NSE_Blocks.CROSS_CRIMSON_PLANKS_SLAB)
.add(NSE_Blocks.HERRINGBONE_WARPED_PLANKS_STAIRS)
.add(NSE_Blocks.HERRINGBONE_WARPED_PLANKS_SLAB)
.add(NSE_Blocks.CROSS_WARPED_PLANKS_STAIRS)
.add(NSE_Blocks.CROSS_WARPED_PLANKS_SLAB)
.add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_STAIRS)
.add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_SLAB)
.add(NSE_Blocks.CROSS_DARK_OAK_PLANKS_STAIRS)
@ -554,6 +560,8 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider {
.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_WARPED_PLANKS_STAIRS)
.add(NSE_Blocks.CROSS_WARPED_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)
@ -661,6 +669,8 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider {
.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_WARPED_PLANKS_SLAB)
.add(NSE_Blocks.CROSS_WARPED_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)
@ -693,6 +703,8 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider {
.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_WARPED_PLANKS_STAIRS)
.add(NSE_Blocks.CROSS_WARPED_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)
@ -714,6 +726,8 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider {
.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_WARPED_PLANKS_SLAB)
.add(NSE_Blocks.CROSS_WARPED_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)

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

@ -193,6 +193,8 @@ public class ModelGenerator extends FabricModelProvider {
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.CROSS_BIRCH_PLANKS, NSE_Blocks.CROSS_BIRCH_PLANKS_STAIRS, NSE_Blocks.CROSS_BIRCH_PLANKS_SLAB, "floor/planks");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS, NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_SLAB, "floor/planks");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.CROSS_CRIMSON_PLANKS, NSE_Blocks.CROSS_CRIMSON_PLANKS_STAIRS, NSE_Blocks.CROSS_CRIMSON_PLANKS_SLAB, "floor/planks");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.HERRINGBONE_WARPED_PLANKS, NSE_Blocks.HERRINGBONE_WARPED_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_WARPED_PLANKS_SLAB, "floor/planks");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.CROSS_WARPED_PLANKS, NSE_Blocks.CROSS_WARPED_PLANKS_STAIRS, NSE_Blocks.CROSS_WARPED_PLANKS_SLAB, "floor/planks");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS, NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_SLAB, "floor/planks");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.CROSS_DARK_OAK_PLANKS, NSE_Blocks.CROSS_DARK_OAK_PLANKS_STAIRS, NSE_Blocks.CROSS_DARK_OAK_PLANKS_SLAB, "floor/planks");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS, NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_SLAB, "floor/planks");

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

@ -387,6 +387,11 @@ public class RecipeGenerator extends FabricRecipeProvider {
list.add(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS);
list.add(Blocks.CRIMSON_PLANKS);
}), RecipeCategory.BUILDING_BLOCKS);
stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.CROSS_WARPED_PLANKS);
list.add(NSE_Blocks.HERRINGBONE_WARPED_PLANKS);
list.add(Blocks.WARPED_PLANKS);
}), RecipeCategory.BUILDING_BLOCKS);
stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.CROSS_DARK_OAK_PLANKS);
list.add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS);
@ -708,6 +713,8 @@ public class RecipeGenerator extends FabricRecipeProvider {
offerStairsAndSlab(exporter, NSE_Blocks.CROSS_BIRCH_PLANKS_STAIRS, NSE_Blocks.CROSS_BIRCH_PLANKS_SLAB, NSE_Blocks.CROSS_BIRCH_PLANKS);
offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS);
offerStairsAndSlab(exporter, NSE_Blocks.CROSS_CRIMSON_PLANKS_STAIRS, NSE_Blocks.CROSS_CRIMSON_PLANKS_SLAB, NSE_Blocks.CROSS_CRIMSON_PLANKS);
offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_WARPED_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_WARPED_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_WARPED_PLANKS);
offerStairsAndSlab(exporter, NSE_Blocks.CROSS_WARPED_PLANKS_STAIRS, NSE_Blocks.CROSS_WARPED_PLANKS_SLAB, NSE_Blocks.CROSS_WARPED_PLANKS);
offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS);
offerStairsAndSlab(exporter, NSE_Blocks.CROSS_DARK_OAK_PLANKS_STAIRS, NSE_Blocks.CROSS_DARK_OAK_PLANKS_SLAB, NSE_Blocks.CROSS_DARK_OAK_PLANKS);
offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS);

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

@ -339,6 +339,12 @@ public class NSE_Blocks extends NSE_BaseRegistration {
public static final Block CROSS_CRIMSON_PLANKS = new Block(FabricBlockSettings.copy(Blocks.CRIMSON_PLANKS));
public static final StairsBlock CROSS_CRIMSON_PLANKS_STAIRS = new StairsBlock(CROSS_CRIMSON_PLANKS.getDefaultState(), FabricBlockSettings.copy(CROSS_CRIMSON_PLANKS));
public static final SlabBlock CROSS_CRIMSON_PLANKS_SLAB = new SlabBlock(FabricBlockSettings.copy(CROSS_CRIMSON_PLANKS));
public static final Block HERRINGBONE_WARPED_PLANKS = new Block(FabricBlockSettings.copy(Blocks.WARPED_PLANKS));
public static final StairsBlock HERRINGBONE_WARPED_PLANKS_STAIRS = new StairsBlock(HERRINGBONE_WARPED_PLANKS.getDefaultState(), FabricBlockSettings.copy(HERRINGBONE_WARPED_PLANKS));
public static final SlabBlock HERRINGBONE_WARPED_PLANKS_SLAB = new SlabBlock(FabricBlockSettings.copy(HERRINGBONE_WARPED_PLANKS));
public static final Block CROSS_WARPED_PLANKS = new Block(FabricBlockSettings.copy(Blocks.WARPED_PLANKS));
public static final StairsBlock CROSS_WARPED_PLANKS_STAIRS = new StairsBlock(CROSS_WARPED_PLANKS.getDefaultState(), FabricBlockSettings.copy(CROSS_WARPED_PLANKS));
public static final SlabBlock CROSS_WARPED_PLANKS_SLAB = new SlabBlock(FabricBlockSettings.copy(CROSS_WARPED_PLANKS));
public static final Block HERRINGBONE_DARK_OAK_PLANKS = new Block(FabricBlockSettings.copy(Blocks.DARK_OAK_PLANKS));
public static final StairsBlock HERRINGBONE_DARK_OAK_PLANKS_STAIRS = new StairsBlock(HERRINGBONE_DARK_OAK_PLANKS.getDefaultState(), FabricBlockSettings.copy(HERRINGBONE_DARK_OAK_PLANKS));
public static final SlabBlock HERRINGBONE_DARK_OAK_PLANKS_SLAB = new SlabBlock(FabricBlockSettings.copy(HERRINGBONE_DARK_OAK_PLANKS));
@ -800,6 +806,12 @@ public class NSE_Blocks extends NSE_BaseRegistration {
registerBlock("cross_crimson_planks", () -> CROSS_CRIMSON_PLANKS, NSE_BUILDING_TAB);
registerBlock("cross_crimson_planks_stairs", () -> CROSS_CRIMSON_PLANKS_STAIRS, NSE_BUILDING_TAB);
registerBlock("cross_crimson_planks_slab", () -> CROSS_CRIMSON_PLANKS_SLAB, NSE_BUILDING_TAB);
registerBlock("herringbone_warped_planks", () -> HERRINGBONE_WARPED_PLANKS, NSE_BUILDING_TAB);
registerBlock("herringbone_warped_planks_stairs", () -> HERRINGBONE_WARPED_PLANKS_STAIRS, NSE_BUILDING_TAB);
registerBlock("herringbone_warped_planks_slab", () -> HERRINGBONE_WARPED_PLANKS_SLAB, NSE_BUILDING_TAB);
registerBlock("cross_warped_planks", () -> CROSS_WARPED_PLANKS, NSE_BUILDING_TAB);
registerBlock("cross_warped_planks_stairs", () -> CROSS_WARPED_PLANKS_STAIRS, NSE_BUILDING_TAB);
registerBlock("cross_warped_planks_slab", () -> CROSS_WARPED_PLANKS_SLAB, NSE_BUILDING_TAB);
registerBlock("herringbone_dark_oak_planks", () -> HERRINGBONE_DARK_OAK_PLANKS, NSE_BUILDING_TAB);
registerBlock("herringbone_dark_oak_planks_stairs", () -> HERRINGBONE_DARK_OAK_PLANKS_STAIRS, NSE_BUILDING_TAB);
registerBlock("herringbone_dark_oak_planks_slab", () -> HERRINGBONE_DARK_OAK_PLANKS_SLAB, NSE_BUILDING_TAB);
@ -930,7 +942,7 @@ public class NSE_Blocks extends NSE_BaseRegistration {
}
public static void flammableInit() {
// Reminder: Crimson doesn't burn!
// Reminder: Crimson and Warped doesn't burn!
FlammableBlockRegistry flammableBlockRegistry = FlammableBlockRegistry.getDefaultInstance();
flammableBlockRegistry.add(HERRINGBONE_ACACIA_PLANKS, 20, 5);
flammableBlockRegistry.add(CROSS_ACACIA_PLANKS, 20, 5);