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

Parquet changes

Browse source
This commit is contained in:
Andrew-71 2024-01-20 14:46:41 +03:00
parent f2373e0971
commit a385d76352
91 changed files with 483 additions and 462 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -154,8 +154,8 @@ public class BlockLootTables extends FabricBlockLootTableProvider {
addDrop(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS);
addDrop(NSE_Blocks.CROSS_SPRUCE_PLANKS);
addDrop(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET);
addDrop(NSE_Blocks.STRAIGHT_PARQUET);
addDrop(NSE_Blocks.SEPARATED_PARQUET);
addDrop(NSE_Blocks.STRAIGHT_OAK_PARQUET);
addDrop(NSE_Blocks.SEPARATED_OAK_PARQUET);
addDrop(NSE_Blocks.GREEN_LINOLEUM);
addDrop(NSE_Blocks.BLUE_LINOLEUM);
addDrop(NSE_Blocks.RED_LINOLEUM);
@ -457,10 +457,10 @@ public class BlockLootTables extends FabricBlockLootTableProvider {
addDrop(NSE_Blocks.CROSS_SPRUCE_PLANKS_STAIRS);
addDrop(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_SLAB);
addDrop(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_STAIRS);
addDrop(NSE_Blocks.STRAIGHT_PARQUET_SLAB);
addDrop(NSE_Blocks.STRAIGHT_PARQUET_STAIRS);
addDrop(NSE_Blocks.SEPARATED_PARQUET_SLAB);
addDrop(NSE_Blocks.SEPARATED_PARQUET_STAIRS);
addDrop(NSE_Blocks.STRAIGHT_OAK_PARQUET_SLAB);
addDrop(NSE_Blocks.STRAIGHT_OAK_PARQUET_STAIRS);
addDrop(NSE_Blocks.SEPARATED_OAK_PARQUET_SLAB);
addDrop(NSE_Blocks.SEPARATED_OAK_PARQUET_STAIRS);
addDrop(NSE_Blocks.GREEN_LINOLEUM_SLAB);
addDrop(NSE_Blocks.GREEN_LINOLEUM_STAIRS);
addDrop(NSE_Blocks.BLUE_LINOLEUM_SLAB);

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

@ -364,8 +364,8 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider {
.add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS)
.add(NSE_Blocks.CROSS_SPRUCE_PLANKS)
.add(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET)
.add(NSE_Blocks.STRAIGHT_PARQUET)
.add(NSE_Blocks.SEPARATED_PARQUET)
.add(NSE_Blocks.STRAIGHT_OAK_PARQUET)
.add(NSE_Blocks.SEPARATED_OAK_PARQUET)
.add(NSE_Blocks.GREEN_LINOLEUM)
.add(NSE_Blocks.BLUE_LINOLEUM)
.add(NSE_Blocks.RED_LINOLEUM)
@ -420,10 +420,10 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider {
.add(NSE_Blocks.CROSS_SPRUCE_PLANKS_SLAB)
.add(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_STAIRS)
.add(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_SLAB)
.add(NSE_Blocks.STRAIGHT_PARQUET_STAIRS)
.add(NSE_Blocks.STRAIGHT_PARQUET_SLAB)
.add(NSE_Blocks.SEPARATED_PARQUET_STAIRS)
.add(NSE_Blocks.SEPARATED_PARQUET_SLAB)
.add(NSE_Blocks.STRAIGHT_OAK_PARQUET_STAIRS)
.add(NSE_Blocks.STRAIGHT_OAK_PARQUET_SLAB)
.add(NSE_Blocks.SEPARATED_OAK_PARQUET_STAIRS)
.add(NSE_Blocks.SEPARATED_OAK_PARQUET_SLAB)
.add(NSE_Blocks.GREEN_LINOLEUM_STAIRS)
.add(NSE_Blocks.GREEN_LINOLEUM_SLAB)
.add(NSE_Blocks.BLUE_LINOLEUM_STAIRS)
@ -603,8 +603,8 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider {
.add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_STAIRS)
.add(NSE_Blocks.CROSS_SPRUCE_PLANKS_STAIRS)
.add(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_STAIRS)
.add(NSE_Blocks.STRAIGHT_PARQUET_STAIRS)
.add(NSE_Blocks.SEPARATED_PARQUET_STAIRS)
.add(NSE_Blocks.STRAIGHT_OAK_PARQUET_STAIRS)
.add(NSE_Blocks.SEPARATED_OAK_PARQUET_STAIRS)
.add(NSE_Blocks.GREEN_LINOLEUM_STAIRS)
.add(NSE_Blocks.BLUE_LINOLEUM_STAIRS)
.add(NSE_Blocks.RED_LINOLEUM_STAIRS)
@ -716,8 +716,8 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider {
.add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_SLAB)
.add(NSE_Blocks.CROSS_SPRUCE_PLANKS_SLAB)
.add(NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_SLAB)
.add(NSE_Blocks.STRAIGHT_PARQUET_SLAB)
.add(NSE_Blocks.SEPARATED_PARQUET_SLAB)
.add(NSE_Blocks.STRAIGHT_OAK_PARQUET_SLAB)
.add(NSE_Blocks.SEPARATED_OAK_PARQUET_SLAB)
.add(NSE_Blocks.GREEN_LINOLEUM_SLAB)
.add(NSE_Blocks.BLUE_LINOLEUM_SLAB)
.add(NSE_Blocks.RED_LINOLEUM_SLAB)

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

@ -5,6 +5,7 @@ import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
import net.minecraft.registry.RegistryWrapper;
import net.minecraft.registry.tag.ItemTags;
import su.a71.new_soviet.registration.NSE_Items;
import su.a71.new_soviet.registration.NSE_Tags;
import java.util.concurrent.CompletableFuture;
@ -22,5 +23,8 @@ public class ItemTagGenerator extends FabricTagProvider.ItemTagProvider {
.add(NSE_Items.DICE_D4)
.add(NSE_Items.DICE_D6)
.add(NSE_Items.DICE_D20);
getOrCreateTagBuilder(ItemTags.MUSIC_DISCS)
.add(NSE_Items.MUSIC_DISC_HEARTBEAT);
}
}

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

@ -214,8 +214,8 @@ public class ModelGenerator extends FabricModelProvider {
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_DARK_OAK_PARQUET, NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_STAIRS, NSE_Blocks.HERRINGBONE_DARK_OAK_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");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.STRAIGHT_OAK_PARQUET, NSE_Blocks.STRAIGHT_OAK_PARQUET_STAIRS, NSE_Blocks.STRAIGHT_OAK_PARQUET_SLAB, "floor/planks");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.SEPARATED_OAK_PARQUET, NSE_Blocks.SEPARATED_OAK_PARQUET_STAIRS, NSE_Blocks.SEPARATED_OAK_PARQUET_SLAB, "floor/planks");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.GREEN_LINOLEUM, NSE_Blocks.GREEN_LINOLEUM_STAIRS, NSE_Blocks.GREEN_LINOLEUM_SLAB, "floor/linoleum");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.BLUE_LINOLEUM, NSE_Blocks.BLUE_LINOLEUM_STAIRS, NSE_Blocks.BLUE_LINOLEUM_SLAB, "floor/linoleum");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.RED_LINOLEUM, NSE_Blocks.RED_LINOLEUM_STAIRS, NSE_Blocks.RED_LINOLEUM_SLAB, "floor/linoleum");

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

@ -409,8 +409,8 @@ public class RecipeGenerator extends FabricRecipeProvider {
stoneCuttingCategory(exporter, Blocks.OAK_PLANKS, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.CROSS_OAK_PLANKS);
list.add(NSE_Blocks.HERRINGBONE_OAK_PLANKS);
list.add(NSE_Blocks.STRAIGHT_PARQUET);
list.add(NSE_Blocks.SEPARATED_PARQUET);
list.add(NSE_Blocks.STRAIGHT_OAK_PARQUET);
list.add(NSE_Blocks.SEPARATED_OAK_PARQUET);
}), RecipeCategory.BUILDING_BLOCKS);
stoneCuttingCategory(exporter, Blocks.BIRCH_PLANKS, Util.make(Lists.newArrayList(), list -> {
list.add(NSE_Blocks.CROSS_BIRCH_PLANKS);
@ -782,8 +782,8 @@ public class RecipeGenerator extends FabricRecipeProvider {
offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS);
offerStairsAndSlab(exporter, NSE_Blocks.CROSS_SPRUCE_PLANKS_STAIRS, NSE_Blocks.CROSS_SPRUCE_PLANKS_SLAB, NSE_Blocks.CROSS_SPRUCE_PLANKS);
offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_STAIRS, NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET_SLAB, NSE_Blocks.HERRINGBONE_DARK_OAK_PARQUET);
offerStairsAndSlab(exporter, NSE_Blocks.STRAIGHT_PARQUET_STAIRS, NSE_Blocks.STRAIGHT_PARQUET_SLAB, NSE_Blocks.STRAIGHT_PARQUET);
offerStairsAndSlab(exporter, NSE_Blocks.SEPARATED_PARQUET_STAIRS, NSE_Blocks.SEPARATED_PARQUET_SLAB, NSE_Blocks.SEPARATED_PARQUET);
offerStairsAndSlab(exporter, NSE_Blocks.STRAIGHT_OAK_PARQUET_STAIRS, NSE_Blocks.STRAIGHT_OAK_PARQUET_SLAB, NSE_Blocks.STRAIGHT_OAK_PARQUET);
offerStairsAndSlab(exporter, NSE_Blocks.SEPARATED_OAK_PARQUET_STAIRS, NSE_Blocks.SEPARATED_OAK_PARQUET_SLAB, NSE_Blocks.SEPARATED_OAK_PARQUET);
offerStairsAndSlab(exporter, NSE_Blocks.GREEN_LINOLEUM_STAIRS, NSE_Blocks.GREEN_LINOLEUM_SLAB, NSE_Blocks.GREEN_LINOLEUM);
offerStairsAndSlab(exporter, NSE_Blocks.BLUE_LINOLEUM_STAIRS, NSE_Blocks.BLUE_LINOLEUM_SLAB, NSE_Blocks.BLUE_LINOLEUM);
offerStairsAndSlab(exporter, NSE_Blocks.RED_LINOLEUM_STAIRS, NSE_Blocks.RED_LINOLEUM_SLAB, NSE_Blocks.RED_LINOLEUM);

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

@ -413,12 +413,12 @@ public class NSE_Blocks extends NSE_BaseRegistration {
public static final Block HERRINGBONE_DARK_OAK_PARQUET = new Block(FabricBlockSettings.create().sounds(NSE_Sounds.PARQUET_SOUNDS).strength(2f, 3f).mapColor(MapColor.OAK_TAN));
public static final StairsBlock HERRINGBONE_DARK_OAK_PARQUET_STAIRS = new StairsBlock(HERRINGBONE_DARK_OAK_PARQUET.getDefaultState(), FabricBlockSettings.copy(HERRINGBONE_DARK_OAK_PARQUET));
public static final SlabBlock HERRINGBONE_DARK_OAK_PARQUET_SLAB = new SlabBlock(FabricBlockSettings.copy(HERRINGBONE_DARK_OAK_PARQUET));
public static final Block STRAIGHT_PARQUET = new Block(FabricBlockSettings.copy(HERRINGBONE_DARK_OAK_PARQUET));
public static final StairsBlock STRAIGHT_PARQUET_STAIRS = new StairsBlock(STRAIGHT_PARQUET.getDefaultState(), FabricBlockSettings.copy(STRAIGHT_PARQUET));
public static final SlabBlock STRAIGHT_PARQUET_SLAB = new SlabBlock(FabricBlockSettings.copy(STRAIGHT_PARQUET));
public static final Block SEPARATED_PARQUET = new Block(FabricBlockSettings.copy(HERRINGBONE_DARK_OAK_PARQUET));
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));
public static final Block STRAIGHT_OAK_PARQUET = new Block(FabricBlockSettings.copy(HERRINGBONE_DARK_OAK_PARQUET));
public static final StairsBlock STRAIGHT_OAK_PARQUET_STAIRS = new StairsBlock(STRAIGHT_OAK_PARQUET.getDefaultState(), FabricBlockSettings.copy(STRAIGHT_OAK_PARQUET));
public static final SlabBlock STRAIGHT_OAK_PARQUET_SLAB = new SlabBlock(FabricBlockSettings.copy(STRAIGHT_OAK_PARQUET));
public static final Block SEPARATED_OAK_PARQUET = new Block(FabricBlockSettings.copy(HERRINGBONE_DARK_OAK_PARQUET));
public static final StairsBlock SEPARATED_OAK_PARQUET_STAIRS = new StairsBlock(SEPARATED_OAK_PARQUET.getDefaultState(), FabricBlockSettings.copy(SEPARATED_OAK_PARQUET));
public static final SlabBlock SEPARATED_OAK_PARQUET_SLAB = new SlabBlock(FabricBlockSettings.copy(SEPARATED_OAK_PARQUET));
// LINOLEUM =======================
public static final Block GREEN_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.CHERRY_WOOD).strength(2, 3f).mapColor(MapColor.TERRACOTTA_GREEN));
@ -912,12 +912,12 @@ public class NSE_Blocks extends NSE_BaseRegistration {
registerBlock("herringbone_dark_oak_parquet", () -> HERRINGBONE_DARK_OAK_PARQUET, NSE_BUILDING_TAB);
registerBlock("herringbone_dark_oak_parquet_stairs", () -> HERRINGBONE_DARK_OAK_PARQUET_STAIRS, NSE_BUILDING_TAB);
registerBlock("herringbone_dark_oak_parquet_slab", () -> HERRINGBONE_DARK_OAK_PARQUET_SLAB, NSE_BUILDING_TAB);
registerBlock("straight_parquet", () -> STRAIGHT_PARQUET, NSE_BUILDING_TAB);
registerBlock("straight_parquet_stairs", () -> STRAIGHT_PARQUET_STAIRS, NSE_BUILDING_TAB);
registerBlock("straight_parquet_slab", () -> STRAIGHT_PARQUET_SLAB, NSE_BUILDING_TAB);
registerBlock("separated_parquet", () -> SEPARATED_PARQUET, NSE_BUILDING_TAB);
registerBlock("separated_parquet_stairs", () -> SEPARATED_PARQUET_STAIRS, NSE_BUILDING_TAB);
registerBlock("separated_parquet_slab", () -> SEPARATED_PARQUET_SLAB, NSE_BUILDING_TAB);
registerBlock("straight_oak_parquet", () -> STRAIGHT_OAK_PARQUET, NSE_BUILDING_TAB);
registerBlock("straight_oak_parquet_stairs", () -> STRAIGHT_OAK_PARQUET_STAIRS, NSE_BUILDING_TAB);
registerBlock("straight_oak_parquet_slab", () -> STRAIGHT_OAK_PARQUET_SLAB, NSE_BUILDING_TAB);
registerBlock("separated_oak_parquet", () -> SEPARATED_OAK_PARQUET, NSE_BUILDING_TAB);
registerBlock("separated_oak_parquet_stairs", () -> SEPARATED_OAK_PARQUET_STAIRS, NSE_BUILDING_TAB);
registerBlock("separated_oak_parquet_slab", () -> SEPARATED_OAK_PARQUET_SLAB, NSE_BUILDING_TAB);
registerBlock("green_linoleum", () -> GREEN_LINOLEUM, NSE_BUILDING_TAB);
registerBlock("green_linoleum_stairs", () -> GREEN_LINOLEUM_STAIRS, NSE_BUILDING_TAB);
@ -1027,8 +1027,8 @@ public class NSE_Blocks extends NSE_BaseRegistration {
flammableBlockRegistry.add(HERRINGBONE_BAMBOO_PLANKS, 20, 5);
flammableBlockRegistry.add(HERRINGBONE_DARK_OAK_PARQUET, 20, 5);
flammableBlockRegistry.add(STRAIGHT_PARQUET, 20, 5);
flammableBlockRegistry.add(SEPARATED_PARQUET, 20, 5);
flammableBlockRegistry.add(STRAIGHT_OAK_PARQUET, 20, 5);
flammableBlockRegistry.add(SEPARATED_OAK_PARQUET, 20, 5);
flammableBlockRegistry.add(GREEN_LINOLEUM, 20, 5);
flammableBlockRegistry.add(BLUE_LINOLEUM, 20, 5);
@ -1077,10 +1077,10 @@ public class NSE_Blocks extends NSE_BaseRegistration {
flammableBlockRegistry.add(HERRINGBONE_DARK_OAK_PARQUET_STAIRS, 20, 5);
flammableBlockRegistry.add(HERRINGBONE_DARK_OAK_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(STRAIGHT_OAK_PARQUET_STAIRS, 20, 5);
flammableBlockRegistry.add(STRAIGHT_OAK_PARQUET_SLAB, 20, 5);
flammableBlockRegistry.add(SEPARATED_OAK_PARQUET_STAIRS, 20, 5);
flammableBlockRegistry.add(SEPARATED_OAK_PARQUET_SLAB, 20, 5);
flammableBlockRegistry.add(GREEN_LINOLEUM_STAIRS, 20, 5);
flammableBlockRegistry.add(GREEN_LINOLEUM_SLAB, 20, 5);