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

Add a lot

Browse source
This commit is contained in:
Andrew-71 2024-03-07 11:24:38 +03:00
parent 0f80a8fc69
commit d40dcc4cc2
439 changed files with 8803 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/su/a71/new_soviet/blocks/SirenBlock.java
View file

@ -52,6 +52,7 @@ public class SirenBlock extends HorizontalFacingBlock implements Waterloggable {
SIREN_SOUNDS.add(new SirenSound("Bell", NSE_Sounds.BELL_SIREN_SOUND, 100));
SIREN_SOUNDS.add(new SirenSound("Woop", NSE_Sounds.WOOP_SIREN_SOUND, 40));
SIREN_SOUNDS.add(new SirenSound("Cloister Bell", NSE_Sounds.CLOISTER_SIREN_SOUND, 60));
SIREN_SOUNDS.add(new SirenSound("Kuplinov siren", NSE_Sounds.KUPLINOV_SIREN_SOUND, 120));
}
@Override

66
src/main/java/su/a71/new_soviet/blocks/StoveBlock.java Normal file
View file

@ -0,0 +1,66 @@
package su.a71.new_soviet.blocks;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.block.*;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.block.piston.PistonBehavior;
import net.minecraft.item.ItemPlacementContext;
import net.minecraft.sound.BlockSoundGroup;
import net.minecraft.state.StateManager;
import net.minecraft.state.property.DirectionProperty;
import net.minecraft.state.property.Properties;
import net.minecraft.util.BlockMirror;
import net.minecraft.util.BlockRotation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
import net.minecraft.util.shape.VoxelShape;
import net.minecraft.util.shape.VoxelShapes;
import net.minecraft.world.BlockView;
import org.jetbrains.annotations.Nullable;
public class StoveBlock extends BlockWithEntity {
public static final DirectionProperty FACING;
public StoveBlock() {
super(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).notSolid().pistonBehavior(PistonBehavior.BLOCK));
setDefaultState(getDefaultState().with(Properties.HORIZONTAL_FACING, Direction.NORTH));
}
@Override
protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
builder.add(Properties.HORIZONTAL_FACING);
}
@Nullable
@Override
public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
return null;
}
@Override
public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext ctx) {
return switch (state.get(FACING)) {
case NORTH, SOUTH -> VoxelShapes.cuboid(0.0625f, 0.0f, 0.3125f, 0.9375f, 0.5625f, 0.6875f);
case EAST, WEST -> VoxelShapes.cuboid(0.3125f, 0.0f, 0.0625f, 0.6875f, 0.5625f, 0.9375f);
default -> VoxelShapes.fullCube();
};
}
@Override
public BlockState getPlacementState(ItemPlacementContext ctx) {
return super.getPlacementState(ctx).with(Properties.HORIZONTAL_FACING, ctx.getHorizontalPlayerFacing().getOpposite());
}
public BlockState rotate(BlockState state, BlockRotation rotation) {
return state.with(FACING, rotation.rotate(state.get(FACING)));
}
public BlockState mirror(BlockState state, BlockMirror mirror) {
return state.rotate(mirror.getRotation(state.get(FACING)));
}
static {
FACING = Properties.HORIZONTAL_FACING;
}
}

72
src/main/java/su/a71/new_soviet/blocks/WMachineBlock.java Normal file
View file

@ -0,0 +1,72 @@
package su.a71.new_soviet.blocks;
import net.minecraft.block.*;
import net.minecraft.block.piston.PistonBehavior;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemPlacementContext;
import net.minecraft.sound.SoundCategory;
import net.minecraft.sound.SoundEvents;
import net.minecraft.state.StateManager;
import net.minecraft.state.property.Properties;
import net.minecraft.util.ActionResult;
import net.minecraft.util.Hand;
import net.minecraft.util.hit.BlockHitResult;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
import net.minecraft.util.shape.VoxelShape;
import net.minecraft.util.shape.VoxelShapes;
import net.minecraft.world.BlockView;
import net.minecraft.world.World;
import net.minecraft.world.WorldView;
import su.a71.new_soviet.NewSoviet;
import su.a71.new_soviet.registration.NSE_Sounds;
import su.a71.new_soviet.util.Shapes;
public class WMachineBlock extends HorizontalFacingBlock {
private final Shapes.HorizontalShape blockShape;
public WMachineBlock(Settings settings, Shapes.HorizontalShape blockShape) {
super(settings.notSolid().nonOpaque().noBlockBreakParticles().pistonBehavior(PistonBehavior.DESTROY).strength(0.1f, 2f));
setDefaultState(getDefaultState().with(Properties.HORIZONTAL_FACING, Direction.NORTH));
this.blockShape = blockShape;
}
@Override
protected void appendProperties(StateManager.Builder<Block, BlockState> builder) {
builder.add(Properties.HORIZONTAL_FACING);
}
@Override
public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext ctx) {
return switch (state.get(FACING)) {
case NORTH -> blockShape.north();
case SOUTH -> blockShape.south();
case EAST -> blockShape.east();
case WEST -> blockShape.west();
default -> VoxelShapes.fullCube();
};
}
@Override
public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
float pitch = (float) NewSoviet.RANDOM.nextBetween(8, 12) / 10;
float volume = (float) NewSoviet.RANDOM.nextBetween(5, 7) / 10;
world.playSound(null, pos, NSE_Sounds.W_MACHINE_BUTTON_PRESS, SoundCategory.BLOCKS, volume, pitch);
return ActionResult.SUCCESS;
}
@Override
public BlockState getPlacementState(ItemPlacementContext ctx) {
return super.getPlacementState(ctx).with(Properties.HORIZONTAL_FACING, ctx.getHorizontalPlayerFacing().getOpposite());
}
protected boolean canPlantOnTop(BlockState floor, BlockView world, BlockPos pos) {
return !floor.getCollisionShape(world, pos).getFace(Direction.UP).isEmpty() || floor.isSideSolidFullSquare(world, pos, Direction.UP);
}
public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) {
BlockPos blockPos = pos.down();
return this.canPlantOnTop(world.getBlockState(blockPos), world, blockPos);
}
}

4
src/main/java/su/a71/new_soviet/blocks/WindowBlock.java
View file

@ -10,7 +10,6 @@ import net.minecraft.fluid.Fluids;
import net.minecraft.item.Item;
import net.minecraft.item.ItemPlacementContext;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.sound.SoundCategory;
import net.minecraft.sound.SoundEvents;
import net.minecraft.state.StateManager;
@ -30,6 +29,7 @@ import net.minecraft.util.shape.VoxelShapes;
import net.minecraft.world.BlockView;
import net.minecraft.world.World;
import org.jetbrains.annotations.Nullable;
import su.a71.new_soviet.NewSoviet;
import su.a71.new_soviet.registration.NSE_Items;
import su.a71.new_soviet.registration.NSE_Sounds;
import su.a71.new_soviet.util.Shapes;
@ -79,7 +79,7 @@ public class WindowBlock extends HorizontalFacingBlock {
return ActionResult.SUCCESS;
}
} if (player.getInventory().getMainHandStack().getItem() == NSE_Items.SCREWDRIVER && !player.getItemCooldownManager().isCoolingDown(NSE_Items.SCREWDRIVER)) {
world.playSound(null, pos.getX(), pos.getY(), pos.getZ(), NSE_Sounds.SCREWDRIVER_SOUND, SoundCategory.BLOCKS, 1.0f, 1f);
world.playSound(null, pos.getX(), pos.getY(), pos.getZ(), NSE_Sounds.SCREWDRIVER_SOUND, SoundCategory.BLOCKS, 1.0f, (float)NewSoviet.RANDOM.nextBetween(8, 11) / 10);
if (!state.get(CLOSED)) {
player.sendMessage(Text.translatable("block.new_soviet.window.fixed").formatted(Formatting.BOLD), true);
} else if (state.get(CLOSED)) {

17
src/main/java/su/a71/new_soviet/blocks/lamps/DevTableLampBlock.java Normal file
View file

@ -0,0 +1,17 @@
package su.a71.new_soviet.blocks.lamps;
import su.a71.new_soviet.util.Shapes;
import java.util.List;
public class DevTableLampBlock extends GoldenTableLampBlock {
public DevTableLampBlock(Settings settings) {
super(settings);
SHAPE = new Shapes.HorizontalShapeLegacy(List.of(
List.of(5.0, 0.0, 5.0, 11.0, 2.0, 11.0),
List.of(7.0, 2.0, 7.0, 9.0, 4.0, 9.0),
List.of(6.0, 4.0, 6.0, 10.0, 5.0, 10.0),
List.of(3.0, 9.0, 3.0, 13.0, 13.0, 7.0)));
}
}

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

@ -28,6 +28,48 @@ public class BlockLootTables extends FabricBlockLootTableProvider {
public void generate() {
// Drops for building blocks
addDrop(NSE_Blocks.SAND_TILES);
addDrop(NSE_Blocks.CONCRETE_PLATE);
addDrop(NSE_Blocks.CONCRETE_PLATE_STAIRS);
addDrop(NSE_Blocks.CONCRETE_PLATE_SLAB);
addDrop(NSE_Blocks.YELLOW_BRICKS);
addDrop(NSE_Blocks.YELLOW_BRICKS_STAIRS);
addDrop(NSE_Blocks.YELLOW_BRICKS_SLAB);
addDrop(NSE_Blocks.CRACKED_YELLOW_BRICKS);
addDrop(NSE_Blocks.CRACKED_YELLOW_BRICKS_STAIRS);
addDrop(NSE_Blocks.CRACKED_YELLOW_BRICKS_SLAB);
addDrop(NSE_Blocks.MOSSY_YELLOW_BRICKS);
addDrop(NSE_Blocks.MOSSY_YELLOW_BRICKS_STAIRS);
addDrop(NSE_Blocks.MOSSY_YELLOW_BRICKS_SLAB);
addDrop(NSE_Blocks.YELLOW_BRICKS_CROSS);
addDrop(NSE_Blocks.YELLOW_BRICKS_CROSS_STAIRS);
addDrop(NSE_Blocks.YELLOW_BRICKS_CROSS_SLAB);
addDrop(NSE_Blocks.CRACKED_YELLOW_BRICKS_CROSS);
addDrop(NSE_Blocks.CRACKED_YELLOW_BRICKS_CROSS_STAIRS);
addDrop(NSE_Blocks.CRACKED_YELLOW_BRICKS_CROSS_SLAB);
addDrop(NSE_Blocks.MOSSY_YELLOW_BRICKS_CROSS);
addDrop(NSE_Blocks.MOSSY_YELLOW_BRICKS_CROSS_STAIRS);
addDrop(NSE_Blocks.MOSSY_YELLOW_BRICKS_CROSS_SLAB);
addDrop(NSE_Blocks.YELLOW_BRICKS_DRESSED);
addDrop(NSE_Blocks.YELLOW_BRICKS_DRESSED_STAIRS);
addDrop(NSE_Blocks.YELLOW_BRICKS_DRESSED_SLAB);
addDrop(NSE_Blocks.CRACKED_YELLOW_BRICKS_DRESSED);
addDrop(NSE_Blocks.CRACKED_YELLOW_BRICKS_DRESSED_STAIRS);
addDrop(NSE_Blocks.CRACKED_YELLOW_BRICKS_DRESSED_SLAB);
addDrop(NSE_Blocks.MOSSY_YELLOW_BRICKS_DRESSED);
addDrop(NSE_Blocks.MOSSY_YELLOW_BRICKS_DRESSED_STAIRS);
addDrop(NSE_Blocks.MOSSY_YELLOW_BRICKS_DRESSED_SLAB);
addDrop(NSE_Blocks.YELLOW_RED_LINOLEUM);
addDrop(NSE_Blocks.YELLOW_RED_LINOLEUM_STAIRS);
addDrop(NSE_Blocks.YELLOW_RED_LINOLEUM_SLAB);
addDrop(NSE_Blocks.BEIGE_LINOLEUM);
addDrop(NSE_Blocks.BEIGE_LINOLEUM_STAIRS);
addDrop(NSE_Blocks.BEIGE_LINOLEUM_SLAB);
addDrop(NSE_Blocks.SPRUCE_JUNGLE_CARVED_PARQUET);
addDrop(NSE_Blocks.SPRUCE_JUNGLE_CARVED_PARQUET_STAIRS);
addDrop(NSE_Blocks.SPRUCE_JUNGLE_CARVED_PARQUET_SLAB);
addDrop(NSE_Blocks.DARK_OAK_SPRUCE_CARVED_PARQUET);
addDrop(NSE_Blocks.DARK_OAK_SPRUCE_CARVED_PARQUET_STAIRS);
addDrop(NSE_Blocks.DARK_OAK_SPRUCE_CARVED_PARQUET_SLAB);
addDrop(NSE_Blocks.NII_FLOOR);
addDrop(NSE_Blocks.BIG_GREEN_TILES);
addDrop(NSE_Blocks.BIG_GREEN_TILES_CRACKED);
@ -49,6 +91,8 @@ public class BlockLootTables extends FabricBlockLootTableProvider {
addDrop(NSE_Blocks.MOSSY_SAND_BRICKS);
addDrop(NSE_Blocks.BIG_SAND_BRICKS);
addDrop(NSE_Blocks.BRICK_TILES);
addDrop(NSE_Blocks.TILE_REST_BLUE);
addDrop(NSE_Blocks.CRACKED_TILE_REST_BLUE);
addDrop(NSE_Blocks.CRACKED_BRICK_TILES);
addDrop(NSE_Blocks.MOSSY_BRICK_TILES);
addDrop(NSE_Blocks.DIRTY_BRICK_TILES);
@ -104,9 +148,20 @@ public class BlockLootTables extends FabricBlockLootTableProvider {
addDrop(NSE_Blocks.SMALL_CRACKED_LIGHT_BLUE_TILES);
addDrop(NSE_Blocks.GLAZED_LIGHT_BLUE_TILES);
addDrop(NSE_Blocks.CRACKED_GLAZED_LIGHT_BLUE_TILES);
addDrop(NSE_Blocks.WHITE_TILES);
addDrop(NSE_Blocks.CRACKED_WHITE_TILES);
addDrop(NSE_Blocks.MOSSY_WHITE_TILES);
addDrop(NSE_Blocks.VARIATED_WHITE_TILES);
addDrop(NSE_Blocks.SMALL_WHITE_TILES);
addDrop(NSE_Blocks.SMALL_CRACKED_WHITE_TILES);
addDrop(NSE_Blocks.GLAZED_WHITE_TILES);
addDrop(NSE_Blocks.CRACKED_GLAZED_WHITE_TILES);
addDrop(NSE_Blocks.LIGHT_BLUE_BRICKS);
addDrop(NSE_Blocks.CRACKED_LIGHT_BLUE_BRICKS);
addDrop(NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS);
addDrop(NSE_Blocks.BLUE_BRICKS);
addDrop(NSE_Blocks.CRACKED_BLUE_BRICKS);
addDrop(NSE_Blocks.MOSSY_BLUE_BRICKS);
addDrop(NSE_Blocks.BIG_GRANITE_TILES);
addDrop(NSE_Blocks.SMALL_GRANITE_TILES);
addDrop(NSE_Blocks.SMALL_CRACKED_GRANITE_TILES);
@ -154,6 +209,7 @@ 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.HERRINGBONE_SPRUCE_PARQUET);
addDrop(NSE_Blocks.STRAIGHT_OAK_PARQUET);
addDrop(NSE_Blocks.SEPARATED_OAK_PARQUET);
addDrop(NSE_Blocks.GREEN_LINOLEUM);
@ -204,6 +260,9 @@ public class BlockLootTables extends FabricBlockLootTableProvider {
addDrop(NSE_Blocks.CHISELED_MANGROVE_DOOR, doorDrops(NSE_Blocks.CHISELED_MANGROVE_DOOR));
addDrop(NSE_Blocks.CHISELED_OAK_DOOR, doorDrops(NSE_Blocks.CHISELED_OAK_DOOR));
addDrop(NSE_Blocks.CHISELED_SPRUCE_DOOR, doorDrops(NSE_Blocks.CHISELED_SPRUCE_DOOR));
addDrop(NSE_Blocks.WHITE_CHISELED_BIRCH_DOOR, doorDrops(NSE_Blocks.CHISELED_BIRCH_DOOR));
addDrop(NSE_Blocks.CHISELED_ACACIA_DOOR, doorDrops(NSE_Blocks.CHISELED_MANGROVE_DOOR));
addDrop(NSE_Blocks.LEATHER_LINED_CHISELED_ACACIA_DOOR, doorDrops(NSE_Blocks.CHISELED_OAK_DOOR));
addDrop(NSE_Blocks.BEIGE_WALLPAPER);
addDrop(NSE_Blocks.BROWN_WALLPAPER);
addDrop(NSE_Blocks.GREEN_WALLPAPER);
@ -357,12 +416,26 @@ public class BlockLootTables extends FabricBlockLootTableProvider {
addDrop(NSE_Blocks.MOSSY_LIGHT_BLUE_TILES_STAIRS);
addDrop(NSE_Blocks.VARIATED_LIGHT_BLUE_TILES_SLAB);
addDrop(NSE_Blocks.VARIATED_LIGHT_BLUE_TILES_STAIRS);
addDrop(NSE_Blocks.WHITE_TILES_SLAB);
addDrop(NSE_Blocks.WHITE_TILES_STAIRS);
addDrop(NSE_Blocks.CRACKED_WHITE_TILES_SLAB);
addDrop(NSE_Blocks.CRACKED_WHITE_TILES_STAIRS);
addDrop(NSE_Blocks.MOSSY_WHITE_TILES_SLAB);
addDrop(NSE_Blocks.MOSSY_WHITE_TILES_STAIRS);
addDrop(NSE_Blocks.VARIATED_WHITE_TILES_SLAB);
addDrop(NSE_Blocks.VARIATED_WHITE_TILES_STAIRS);
addDrop(NSE_Blocks.LIGHT_BLUE_BRICKS_SLAB);
addDrop(NSE_Blocks.LIGHT_BLUE_BRICKS_STAIRS);
addDrop(NSE_Blocks.CRACKED_LIGHT_BLUE_BRICKS_SLAB);
addDrop(NSE_Blocks.CRACKED_LIGHT_BLUE_BRICKS_STAIRS);
addDrop(NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS_SLAB);
addDrop(NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS_STAIRS);
addDrop(NSE_Blocks.BLUE_BRICKS_SLAB);
addDrop(NSE_Blocks.BLUE_BRICKS_STAIRS);
addDrop(NSE_Blocks.CRACKED_BLUE_BRICKS_SLAB);
addDrop(NSE_Blocks.CRACKED_BLUE_BRICKS_STAIRS);
addDrop(NSE_Blocks.MOSSY_BLUE_BRICKS_SLAB);
addDrop(NSE_Blocks.MOSSY_BLUE_BRICKS_STAIRS);
addDrop(NSE_Blocks.GREEN_WHITE_TILES_SLAB);
addDrop(NSE_Blocks.GREEN_WHITE_TILES_STAIRS);
addDrop(NSE_Blocks.CRACKED_GREEN_WHITE_TILES_SLAB);
@ -457,6 +530,8 @@ 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.HERRINGBONE_SPRUCE_PARQUET_SLAB);
addDrop(NSE_Blocks.HERRINGBONE_SPRUCE_PARQUET_STAIRS);
addDrop(NSE_Blocks.STRAIGHT_OAK_PARQUET_SLAB);
addDrop(NSE_Blocks.STRAIGHT_OAK_PARQUET_STAIRS);
addDrop(NSE_Blocks.SEPARATED_OAK_PARQUET_SLAB);

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

@ -64,6 +64,9 @@ public class ModelGenerator extends FabricModelProvider {
registerDoor(blockStateModelGenerator, NSE_Blocks.CHISELED_SPRUCE_DOOR);
registerDoor(blockStateModelGenerator, NSE_Blocks.CHISELED_OAK_DOOR);
registerDoor(blockStateModelGenerator, NSE_Blocks.CHISELED_MANGROVE_DOOR);
registerDoor(blockStateModelGenerator, NSE_Blocks.LEATHER_LINED_CHISELED_ACACIA_DOOR);
registerDoor(blockStateModelGenerator, NSE_Blocks.CHISELED_ACACIA_DOOR);
registerDoor(blockStateModelGenerator, NSE_Blocks.WHITE_CHISELED_BIRCH_DOOR);
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.SAND_TILES, NSE_Blocks.SAND_TILES_STAIRS, NSE_Blocks.SAND_TILES_SLAB, "sand");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.CRACKED_SAND_TILES, NSE_Blocks.CRACKED_SAND_TILES_STAIRS, NSE_Blocks.CRACKED_SAND_TILES_SLAB, "sand");
@ -149,6 +152,8 @@ public class ModelGenerator extends FabricModelProvider {
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.LIGHT_BLUE_BRICKS, NSE_Blocks.LIGHT_BLUE_BRICKS_STAIRS, NSE_Blocks.LIGHT_BLUE_BRICKS_SLAB, "light_blue");
// cracked light blue bricks are variated
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS, NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS_STAIRS, NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS_SLAB, "light_blue");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.BLUE_BRICKS, NSE_Blocks.BLUE_BRICKS_STAIRS, NSE_Blocks.BLUE_BRICKS_SLAB, "blue");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.MOSSY_BLUE_BRICKS, NSE_Blocks.MOSSY_BLUE_BRICKS_STAIRS, NSE_Blocks.MOSSY_BLUE_BRICKS_SLAB, "blue");
registerCube(blockStateModelGenerator, NSE_Blocks.BIG_GRANITE_TILES, "granite");
registerCube(blockStateModelGenerator, NSE_Blocks.SMALL_GRANITE_TILES, "granite");
registerCube(blockStateModelGenerator, NSE_Blocks.SMALL_CRACKED_GRANITE_TILES, "granite");
@ -171,6 +176,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");
registerCube(blockStateModelGenerator, NSE_Blocks.TILE_REST_BLUE, "blue");
registerCube(blockStateModelGenerator, NSE_Blocks.CRACKED_TILE_REST_BLUE, "blue");
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");
@ -223,6 +230,10 @@ public class ModelGenerator extends FabricModelProvider {
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.ORANGE_LINOLEUM, NSE_Blocks.ORANGE_LINOLEUM_STAIRS, NSE_Blocks.ORANGE_LINOLEUM_SLAB, "floor/linoleum");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.BROWN_LINOLEUM, NSE_Blocks.BROWN_LINOLEUM_STAIRS, NSE_Blocks.BROWN_LINOLEUM_SLAB, "floor/linoleum");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.CYAN_LINOLEUM, NSE_Blocks.CYAN_LINOLEUM_STAIRS, NSE_Blocks.CYAN_LINOLEUM_SLAB, "floor/linoleum");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.BEIGE_LINOLEUM, NSE_Blocks.BEIGE_LINOLEUM_STAIRS, NSE_Blocks.BEIGE_LINOLEUM_SLAB, "floor/linoleum");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.YELLOW_RED_LINOLEUM, NSE_Blocks.YELLOW_RED_LINOLEUM_STAIRS, NSE_Blocks.YELLOW_RED_LINOLEUM_SLAB, "floor/linoleum");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.SPRUCE_JUNGLE_CARVED_PARQUET, NSE_Blocks.SPRUCE_JUNGLE_CARVED_PARQUET_STAIRS, NSE_Blocks.SPRUCE_JUNGLE_CARVED_PARQUET_SLAB, "floor/planks");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.DARK_OAK_SPRUCE_CARVED_PARQUET, NSE_Blocks.DARK_OAK_SPRUCE_CARVED_PARQUET_STAIRS, NSE_Blocks.DARK_OAK_SPRUCE_CARVED_PARQUET_SLAB, "floor/planks");
registerCube(blockStateModelGenerator, NSE_Blocks.CROSS_ORANGE_LINOLEUM, "floor/linoleum");
registerCube(blockStateModelGenerator, NSE_Blocks.CROSS_BROWN_LINOLEUM, "floor/linoleum");
registerCube(blockStateModelGenerator, NSE_Blocks.INDUSTRIAL_WARNING, "industrial/warning");
@ -238,6 +249,21 @@ public class ModelGenerator extends FabricModelProvider {
registerCube(blockStateModelGenerator, NSE_Blocks.PURPLE_WARNING, "industrial/warning");
registerCube(blockStateModelGenerator, NSE_Blocks.MAGENTA_WARNING, "industrial/warning");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.METAL_PLATING, NSE_Blocks.METAL_PLATING_STAIRS, NSE_Blocks.METAL_PLATING_SLAB, "industrial");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.YELLOW_BRICKS, NSE_Blocks.YELLOW_BRICKS_STAIRS, NSE_Blocks.YELLOW_BRICKS_SLAB, "yellow");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.CRACKED_YELLOW_BRICKS, NSE_Blocks.CRACKED_YELLOW_BRICKS_STAIRS, NSE_Blocks.CRACKED_YELLOW_BRICKS_SLAB, "yellow");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.MOSSY_YELLOW_BRICKS, NSE_Blocks.MOSSY_YELLOW_BRICKS_STAIRS, NSE_Blocks.MOSSY_YELLOW_BRICKS_SLAB, "yellow");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.YELLOW_BRICKS_CROSS, NSE_Blocks.YELLOW_BRICKS_CROSS_STAIRS, NSE_Blocks.YELLOW_BRICKS_CROSS_SLAB, "yellow");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.CRACKED_YELLOW_BRICKS_CROSS, NSE_Blocks.CRACKED_YELLOW_BRICKS_CROSS_STAIRS, NSE_Blocks.CRACKED_YELLOW_BRICKS_CROSS_SLAB, "yellow");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.MOSSY_YELLOW_BRICKS_CROSS, NSE_Blocks.MOSSY_YELLOW_BRICKS_CROSS_STAIRS, NSE_Blocks.MOSSY_YELLOW_BRICKS_CROSS_SLAB, "yellow");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.YELLOW_BRICKS_DRESSED, NSE_Blocks.YELLOW_BRICKS_DRESSED_STAIRS, NSE_Blocks.YELLOW_BRICKS_DRESSED_SLAB, "yellow");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.CRACKED_YELLOW_BRICKS_DRESSED, NSE_Blocks.CRACKED_YELLOW_BRICKS_DRESSED_STAIRS, NSE_Blocks.CRACKED_YELLOW_BRICKS_DRESSED_SLAB, "yellow");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.MOSSY_YELLOW_BRICKS_DRESSED, NSE_Blocks.MOSSY_YELLOW_BRICKS_DRESSED_STAIRS, NSE_Blocks.MOSSY_YELLOW_BRICKS_DRESSED_SLAB, "yellow");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.WHITE_TILES, NSE_Blocks.WHITE_TILES_STAIRS, NSE_Blocks.WHITE_TILES_SLAB, "white");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.CRACKED_WHITE_TILES, NSE_Blocks.CRACKED_WHITE_TILES_STAIRS, NSE_Blocks.CRACKED_WHITE_TILES_SLAB, "white");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.MOSSY_WHITE_TILES, NSE_Blocks.MOSSY_WHITE_TILES_STAIRS, NSE_Blocks.MOSSY_WHITE_TILES_SLAB, "white");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.VARIATED_WHITE_TILES, NSE_Blocks.VARIATED_WHITE_TILES_STAIRS, NSE_Blocks.VARIATED_WHITE_TILES_SLAB, "white");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.CONCRETE_PLATE, NSE_Blocks.CONCRETE_PLATE_STAIRS, NSE_Blocks.CONCRETE_PLATE_SLAB, "concrete");
registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.HERRINGBONE_SPRUCE_PARQUET, NSE_Blocks.HERRINGBONE_SPRUCE_PARQUET_STAIRS, NSE_Blocks.HERRINGBONE_SPRUCE_PARQUET_SLAB, "floor/planks");
}
@Override

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

@ -871,12 +871,5 @@ public class RecipeGenerator extends FabricRecipeProvider {
List.of(NSE_Blocks.GREEN_LINOLEUM.asItem(), NSE_Blocks.ORANGE_LINOLEUM.asItem(), NSE_Blocks.BLUE_LINOLEUM.asItem(),
NSE_Blocks.RED_LINOLEUM.asItem(), NSE_Blocks.GRAY_LINOLEUM.asItem(), NSE_Blocks.BROWN_LINOLEUM.asItem(), NSE_Blocks.CYAN_LINOLEUM.asItem()),
"linoleum");
// Banner patterns
// ShapelessRecipeJsonBuilder.create(RecipeCategory.MISC, NSE_Items., 2)
// .input(Items.BRICKS).input(NSE_Blocks.GREEN_BRICKS)
// .criterion(hasItem(NSE_Blocks.GREEN_BRICKS), conditionsFromItem(NSE_Blocks.GREEN_BRICKS))
// .criterion(hasItem(Items.BRICKS), conditionsFromItem(Items.BRICKS))
// .offerTo(exporter);
}
}

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

@ -220,6 +220,18 @@ public class NSE_Blocks extends NSE_BaseRegistration {
public static final StairsBlock MOSSY_LIGHT_BLUE_BRICKS_STAIRS = new StairsBlock(MOSSY_LIGHT_BLUE_BRICKS.getDefaultState(), FabricBlockSettings.copy(MOSSY_LIGHT_BLUE_BRICKS));
public static final SlabBlock MOSSY_LIGHT_BLUE_BRICKS_SLAB = new SlabBlock(FabricBlockSettings.copy(MOSSY_LIGHT_BLUE_BRICKS));
public static final Block BLUE_BRICKS = new Block(FabricBlockSettings.copy(LIGHT_BLUE_TILES).mapColor(MapColor.WATER_BLUE));
public static final StairsBlock BLUE_BRICKS_STAIRS = new StairsBlock(BLUE_BRICKS.getDefaultState(), FabricBlockSettings.copy(BLUE_BRICKS));
public static final SlabBlock BLUE_BRICKS_SLAB = new SlabBlock(FabricBlockSettings.copy(BLUE_BRICKS));
public static final Block CRACKED_BLUE_BRICKS = new Block(FabricBlockSettings.copy(LIGHT_BLUE_TILES));
public static final StairsBlock CRACKED_BLUE_BRICKS_STAIRS = new StairsBlock(CRACKED_BLUE_BRICKS.getDefaultState(), FabricBlockSettings.copy(CRACKED_BLUE_BRICKS));
public static final SlabBlock CRACKED_BLUE_BRICKS_SLAB = new SlabBlock(FabricBlockSettings.copy(CRACKED_BLUE_BRICKS));
public static final Block MOSSY_BLUE_BRICKS = new Block(FabricBlockSettings.copy(LIGHT_BLUE_TILES));
public static final StairsBlock MOSSY_BLUE_BRICKS_STAIRS = new StairsBlock(MOSSY_BLUE_BRICKS.getDefaultState(), FabricBlockSettings.copy(MOSSY_BLUE_BRICKS));
public static final SlabBlock MOSSY_BLUE_BRICKS_SLAB = new SlabBlock(FabricBlockSettings.copy(MOSSY_BLUE_BRICKS));
public static final Block TILE_REST_BLUE = new Block(FabricBlockSettings.copy(LIGHT_BLUE_TILES).mapColor(MapColor.WATER_BLUE));
public static final Block CRACKED_TILE_REST_BLUE = new Block(FabricBlockSettings.copy(LIGHT_BLUE_TILES).mapColor(MapColor.WATER_BLUE));
public static final Block BIG_GRANITE_TILES = new Block(FabricBlockSettings.copy(Blocks.POLISHED_GRANITE));
public static final Block SMALL_GRANITE_TILES = new Block(FabricBlockSettings.copy(Blocks.POLISHED_GRANITE));
public static final Block SMALL_CRACKED_GRANITE_TILES = new Block(FabricBlockSettings.copy(Blocks.POLISHED_GRANITE));
@ -258,6 +270,18 @@ public class NSE_Blocks extends NSE_BaseRegistration {
public static final Block SMALL_CRACKED_WHITE_TILES = new Block(FabricBlockSettings.copy(SMALL_WHITE_TILES));
public static final Block GLAZED_WHITE_TILES = new Block(FabricBlockSettings.copy(SMALL_WHITE_TILES));
public static final Block CRACKED_GLAZED_WHITE_TILES = new Block(FabricBlockSettings.copy(SMALL_WHITE_TILES));
public static final Block WHITE_TILES = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).strength(1.5f, 6f).requiresTool().mapColor(MapColor.WHITE));
public static final StairsBlock WHITE_TILES_STAIRS = new StairsBlock(WHITE_TILES.getDefaultState(), FabricBlockSettings.copy(WHITE_TILES));
public static final SlabBlock WHITE_TILES_SLAB = new SlabBlock(FabricBlockSettings.copy(WHITE_TILES));
public static final Block CRACKED_WHITE_TILES = new Block(FabricBlockSettings.copy(WHITE_TILES));
public static final StairsBlock CRACKED_WHITE_TILES_STAIRS = new StairsBlock(WHITE_TILES.getDefaultState(), FabricBlockSettings.copy(WHITE_TILES));
public static final SlabBlock CRACKED_WHITE_TILES_SLAB = new SlabBlock(FabricBlockSettings.copy(WHITE_TILES));
public static final Block MOSSY_WHITE_TILES = new Block(FabricBlockSettings.copy(WHITE_TILES));
public static final StairsBlock MOSSY_WHITE_TILES_STAIRS = new StairsBlock(WHITE_TILES.getDefaultState(), FabricBlockSettings.copy(WHITE_TILES));
public static final SlabBlock MOSSY_WHITE_TILES_SLAB = new SlabBlock(FabricBlockSettings.copy(WHITE_TILES));
public static final Block VARIATED_WHITE_TILES = new Block(FabricBlockSettings.copy(WHITE_TILES));
public static final StairsBlock VARIATED_WHITE_TILES_STAIRS = new StairsBlock(WHITE_TILES.getDefaultState(), FabricBlockSettings.copy(WHITE_TILES));
public static final SlabBlock VARIATED_WHITE_TILES_SLAB = new SlabBlock(FabricBlockSettings.copy(WHITE_TILES));
public static final Block SMALL_YELLOW_TILES = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).strength(1.5f, 6f).requiresTool().mapColor(MapColor.YELLOW));
public static final Block SMALL_CRACKED_YELLOW_TILES = new Block(FabricBlockSettings.copy(SMALL_YELLOW_TILES));
@ -271,6 +295,26 @@ public class NSE_Blocks extends NSE_BaseRegistration {
public static final StairsBlock MOSSY_YELLOW_BRICKS_STAIRS = new StairsBlock(MOSSY_YELLOW_BRICKS.getDefaultState(), FabricBlockSettings.copy(MOSSY_YELLOW_BRICKS));
public static final SlabBlock MOSSY_YELLOW_BRICKS_SLAB = new SlabBlock(FabricBlockSettings.copy(MOSSY_YELLOW_BRICKS));
public static final Block YELLOW_BRICKS_CROSS = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).strength(1.5f, 6f).requiresTool().mapColor(MapColor.YELLOW));
public static final StairsBlock YELLOW_BRICKS_CROSS_STAIRS = new StairsBlock(YELLOW_BRICKS.getDefaultState(), FabricBlockSettings.copy(YELLOW_BRICKS));
public static final SlabBlock YELLOW_BRICKS_CROSS_SLAB = new SlabBlock(FabricBlockSettings.copy(YELLOW_BRICKS));
public static final Block CRACKED_YELLOW_BRICKS_CROSS = new Block(FabricBlockSettings.copy(NSE_Blocks.YELLOW_BRICKS));
public static final StairsBlock CRACKED_YELLOW_BRICKS_CROSS_STAIRS = new StairsBlock(CRACKED_YELLOW_BRICKS.getDefaultState(), FabricBlockSettings.copy(CRACKED_YELLOW_BRICKS));
public static final SlabBlock CRACKED_YELLOW_BRICKS_CROSS_SLAB = new SlabBlock(FabricBlockSettings.copy(CRACKED_YELLOW_BRICKS));
public static final Block MOSSY_YELLOW_BRICKS_CROSS = new Block(FabricBlockSettings.copy(NSE_Blocks.YELLOW_BRICKS));
public static final StairsBlock MOSSY_YELLOW_BRICKS_CROSS_STAIRS = new StairsBlock(MOSSY_YELLOW_BRICKS.getDefaultState(), FabricBlockSettings.copy(MOSSY_YELLOW_BRICKS));
public static final SlabBlock MOSSY_YELLOW_BRICKS_CROSS_SLAB = new SlabBlock(FabricBlockSettings.copy(MOSSY_YELLOW_BRICKS));
public static final Block YELLOW_BRICKS_DRESSED = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).strength(1.5f, 6f).requiresTool().mapColor(MapColor.YELLOW));
public static final StairsBlock YELLOW_BRICKS_DRESSED_STAIRS = new StairsBlock(YELLOW_BRICKS.getDefaultState(), FabricBlockSettings.copy(YELLOW_BRICKS));
public static final SlabBlock YELLOW_BRICKS_DRESSED_SLAB = new SlabBlock(FabricBlockSettings.copy(YELLOW_BRICKS));
public static final Block CRACKED_YELLOW_BRICKS_DRESSED = new Block(FabricBlockSettings.copy(NSE_Blocks.YELLOW_BRICKS));
public static final StairsBlock CRACKED_YELLOW_BRICKS_DRESSED_STAIRS = new StairsBlock(CRACKED_YELLOW_BRICKS.getDefaultState(), FabricBlockSettings.copy(CRACKED_YELLOW_BRICKS));
public static final SlabBlock CRACKED_YELLOW_BRICKS_DRESSED_SLAB = new SlabBlock(FabricBlockSettings.copy(CRACKED_YELLOW_BRICKS));
public static final Block MOSSY_YELLOW_BRICKS_DRESSED = new Block(FabricBlockSettings.copy(NSE_Blocks.YELLOW_BRICKS));
public static final StairsBlock MOSSY_YELLOW_BRICKS_DRESSED_STAIRS = new StairsBlock(MOSSY_YELLOW_BRICKS.getDefaultState(), FabricBlockSettings.copy(MOSSY_YELLOW_BRICKS));
public static final SlabBlock MOSSY_YELLOW_BRICKS_DRESSED_SLAB = new SlabBlock(FabricBlockSettings.copy(MOSSY_YELLOW_BRICKS));
public static final Block WHITEWASH = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).strength(1.5f, 6f).requiresTool().mapColor(MapColor.OFF_WHITE));
public static final Block CRACKED_WHITEWASH = new Block(FabricBlockSettings.copy(WHITEWASH));
public static final Block VERY_CRACKED_WHITEWASH = new Block(FabricBlockSettings.copy(WHITEWASH));
@ -339,11 +383,14 @@ public class NSE_Blocks extends NSE_BaseRegistration {
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 Block CONCRETE_PLATE = new Block(FabricBlockSettings.copy(CONCRETE));
public static final StairsBlock CONCRETE_PLATE_STAIRS = new StairsBlock(CONCRETE_PLATE.getDefaultState(), FabricBlockSettings.copy(ORANGE_CONCRETE));
public static final SlabBlock CONCRETE_PLATE_SLAB = new SlabBlock(FabricBlockSettings.copy(ORANGE_CONCRETE));
public static final GravelBlock DIRT_ROAD = new GravelBlock(FabricBlockSettings.copy(Blocks.GRAVEL));
// WOOD/FLOOR ==========
public static final Block HERRINGBONE_ACACIA_PLANKS = new Block(FabricBlockSettings.copy(Blocks.ACACIA_PLANKS));
public static final Block HERRINGBONE_ACACIA_PLANKS = new Block(FabricBlockSettings.copy(Blocks.ACACIA_PLANKS).sounds(NSE_Sounds.PARQUET_SOUNDS));
public static final StairsBlock HERRINGBONE_ACACIA_PLANKS_STAIRS = new StairsBlock(HERRINGBONE_ACACIA_PLANKS.getDefaultState(), FabricBlockSettings.copy(HERRINGBONE_ACACIA_PLANKS));
public static final SlabBlock HERRINGBONE_ACACIA_PLANKS_SLAB = new SlabBlock(FabricBlockSettings.copy(HERRINGBONE_ACACIA_PLANKS));
public static final Block CROSS_ACACIA_PLANKS = new Block(FabricBlockSettings.copy(Blocks.ACACIA_PLANKS));
@ -406,16 +453,24 @@ public class NSE_Blocks extends NSE_BaseRegistration {
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_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 HERRINGBONE_SPRUCE_PARQUET = new Block(FabricBlockSettings.create().sounds(NSE_Sounds.PARQUET_SOUNDS).strength(2f, 3f).mapColor(MapColor.SPRUCE_BROWN));
public static final StairsBlock HERRINGBONE_SPRUCE_PARQUET_STAIRS = new StairsBlock(HERRINGBONE_SPRUCE_PARQUET.getDefaultState(), FabricBlockSettings.copy(HERRINGBONE_SPRUCE_PARQUET));
public static final SlabBlock HERRINGBONE_SPRUCE_PARQUET_SLAB = new SlabBlock(FabricBlockSettings.copy(HERRINGBONE_SPRUCE_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));
public static final Block SPRUCE_JUNGLE_CARVED_PARQUET = new Block(FabricBlockSettings.copy(Blocks.BAMBOO_PLANKS));
public static final StairsBlock SPRUCE_JUNGLE_CARVED_PARQUET_STAIRS = new StairsBlock(SPRUCE_JUNGLE_CARVED_PARQUET.getDefaultState(), FabricBlockSettings.copy(SPRUCE_JUNGLE_CARVED_PARQUET));
public static final SlabBlock SPRUCE_JUNGLE_CARVED_PARQUET_SLAB = new SlabBlock(FabricBlockSettings.copy(SPRUCE_JUNGLE_CARVED_PARQUET));
public static final Block DARK_OAK_SPRUCE_CARVED_PARQUET = new Block(FabricBlockSettings.copy(Blocks.BAMBOO_PLANKS));
public static final StairsBlock DARK_OAK_SPRUCE_CARVED_PARQUET_STAIRS = new StairsBlock(DARK_OAK_SPRUCE_CARVED_PARQUET.getDefaultState(), FabricBlockSettings.copy(DARK_OAK_SPRUCE_CARVED_PARQUET));
public static final SlabBlock DARK_OAK_SPRUCE_CARVED_PARQUET_SLAB = new SlabBlock(FabricBlockSettings.copy(DARK_OAK_SPRUCE_CARVED_PARQUET));
// LINOLEUM =======================
public static final Block GREEN_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.CHERRY_WOOD).strength(2, 3f).mapColor(MapColor.TERRACOTTA_GREEN));
@ -441,11 +496,19 @@ public class NSE_Blocks extends NSE_BaseRegistration {
public static final SlabBlock CYAN_LINOLEUM_SLAB = new SlabBlock(FabricBlockSettings.copy(CYAN_LINOLEUM));
public static final Block CROSS_ORANGE_LINOLEUM = new Block(FabricBlockSettings.copy(GREEN_LINOLEUM).mapColor(MapColor.ORANGE));
public static final Block CROSS_BROWN_LINOLEUM = new Block(FabricBlockSettings.copy(GREEN_LINOLEUM).mapColor(MapColor.BROWN));
public static final Block YELLOW_RED_LINOLEUM = new Block(FabricBlockSettings.copy(GREEN_LINOLEUM).mapColor(MapColor.ORANGE));
public static final StairsBlock YELLOW_RED_LINOLEUM_STAIRS = new StairsBlock(YELLOW_RED_LINOLEUM.getDefaultState(), FabricBlockSettings.copy(YELLOW_RED_LINOLEUM));
public static final SlabBlock YELLOW_RED_LINOLEUM_SLAB = new SlabBlock(FabricBlockSettings.copy(YELLOW_RED_LINOLEUM));
public static final Block BEIGE_LINOLEUM = new Block(FabricBlockSettings.copy(GREEN_LINOLEUM).mapColor(MapColor.TERRACOTTA_YELLOW));
public static final StairsBlock BEIGE_LINOLEUM_STAIRS = new StairsBlock(BEIGE_LINOLEUM.getDefaultState(), FabricBlockSettings.copy(BEIGE_LINOLEUM));
public static final SlabBlock BEIGE_LINOLEUM_SLAB = new SlabBlock(FabricBlockSettings.copy(BEIGE_LINOLEUM));
public static final DoorBlock CHISELED_MANGROVE_DOOR = new DoorBlock(FabricBlockSettings.copy(Blocks.MANGROVE_DOOR), BlockSetType.MANGROVE);
public static final DoorBlock CHISELED_OAK_DOOR = new DoorBlock(FabricBlockSettings.copy(Blocks.OAK_DOOR), BlockSetType.OAK);
public static final DoorBlock CHISELED_SPRUCE_DOOR = new DoorBlock(FabricBlockSettings.copy(Blocks.SPRUCE_DOOR), BlockSetType.SPRUCE);
public static final DoorBlock CHISELED_BIRCH_DOOR = new DoorBlock(FabricBlockSettings.copy(Blocks.BIRCH_DOOR), BlockSetType.BIRCH);
public static final DoorBlock WHITE_CHISELED_BIRCH_DOOR = new DoorBlock(FabricBlockSettings.copy(Blocks.BIRCH_DOOR), BlockSetType.BIRCH);
public static final DoorBlock CHISELED_ACACIA_DOOR = new DoorBlock(FabricBlockSettings.copy(Blocks.BIRCH_DOOR), BlockSetType.ACACIA);
public static final DoorBlock LEATHER_LINED_CHISELED_ACACIA_DOOR = new DoorBlock(FabricBlockSettings.copy(Blocks.BIRCH_DOOR), BlockSetType.ACACIA);
public static final Block NII_FLOOR = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.POLISHED_DEEPSLATE).strength(1.5f, 6f).requiresTool().mapColor(MapColor.GRAY));
public static final StairsBlock NII_FLOOR_STAIRS = new StairsBlock(NII_FLOOR.getDefaultState(), FabricBlockSettings.copy(NII_FLOOR));
@ -731,6 +794,18 @@ public class NSE_Blocks extends NSE_BaseRegistration {
registerBlock("mossy_light_blue_bricks", () -> MOSSY_LIGHT_BLUE_BRICKS, NSE_BUILDING_TAB);
registerBlock("mossy_light_blue_bricks_stairs", () -> MOSSY_LIGHT_BLUE_BRICKS_STAIRS, NSE_BUILDING_TAB);
registerBlock("mossy_light_blue_bricks_slab", () -> MOSSY_LIGHT_BLUE_BRICKS_SLAB, NSE_BUILDING_TAB);
registerBlock("tile_rest_blue", () -> TILE_REST_BLUE, NSE_BUILDING_TAB);
registerBlock("cracked_tile_rest_blue", () -> CRACKED_TILE_REST_BLUE, NSE_BUILDING_TAB);
registerBlock("blue_bricks", () -> BLUE_BRICKS, NSE_BUILDING_TAB);
registerBlock("blue_bricks_stairs", () -> BLUE_BRICKS_STAIRS, NSE_BUILDING_TAB);
registerBlock("blue_bricks_slab", () -> BLUE_BRICKS_SLAB, NSE_BUILDING_TAB);
registerBlock("cracked_blue_bricks", () -> CRACKED_BLUE_BRICKS, NSE_BUILDING_TAB);
registerBlock("cracked_blue_bricks_stairs", () -> CRACKED_BLUE_BRICKS_STAIRS, NSE_BUILDING_TAB);
registerBlock("cracked_blue_bricks_slab", () -> CRACKED_BLUE_BRICKS_SLAB, NSE_BUILDING_TAB);
registerBlock("mossy_blue_bricks", () -> MOSSY_BLUE_BRICKS, NSE_BUILDING_TAB);
registerBlock("mossy_blue_bricks_stairs", () -> MOSSY_BLUE_BRICKS_STAIRS, NSE_BUILDING_TAB);
registerBlock("mossy_blue_bricks_slab", () -> MOSSY_BLUE_BRICKS_SLAB, NSE_BUILDING_TAB);
registerBlock("big_granite_tiles", () -> BIG_GRANITE_TILES, NSE_BUILDING_TAB);
registerBlock("small_granite_tiles", () -> SMALL_GRANITE_TILES, NSE_BUILDING_TAB);
@ -770,6 +845,18 @@ public class NSE_Blocks extends NSE_BaseRegistration {
registerBlock("small_cracked_white_tiles", () -> SMALL_CRACKED_WHITE_TILES, NSE_BUILDING_TAB);
registerBlock("glazed_white_tiles", () -> GLAZED_WHITE_TILES, NSE_BUILDING_TAB);
registerBlock("cracked_glazed_white_tiles", () -> CRACKED_GLAZED_WHITE_TILES, NSE_BUILDING_TAB);
registerBlock("white_tiles", () -> WHITE_TILES, NSE_BUILDING_TAB);
registerBlock("white_tiles_stairs", () -> WHITE_TILES_STAIRS, NSE_BUILDING_TAB);
registerBlock("white_tiles_slab", () -> WHITE_TILES_SLAB, NSE_BUILDING_TAB);
registerBlock("cracked_white_tiles", () -> CRACKED_WHITE_TILES, NSE_BUILDING_TAB);
registerBlock("cracked_white_tiles_stairs", () -> CRACKED_WHITE_TILES_STAIRS, NSE_BUILDING_TAB);
registerBlock("cracked_white_tiles_slab", () -> CRACKED_WHITE_TILES_SLAB, NSE_BUILDING_TAB);
registerBlock("mossy_white_tiles", () -> MOSSY_WHITE_TILES, NSE_BUILDING_TAB);
registerBlock("mossy_white_tiles_stairs", () -> MOSSY_WHITE_TILES_STAIRS, NSE_BUILDING_TAB);
registerBlock("mossy_white_tiles_slab", () -> MOSSY_WHITE_TILES_SLAB, NSE_BUILDING_TAB);
registerBlock("variated_white_tiles", () -> VARIATED_WHITE_TILES, NSE_BUILDING_TAB);
registerBlock("variated_white_tiles_stairs", () -> VARIATED_WHITE_TILES_STAIRS, NSE_BUILDING_TAB);
registerBlock("variated_white_tiles_slab", () -> VARIATED_WHITE_TILES_SLAB, NSE_BUILDING_TAB);
registerBlock("small_yellow_tiles", () -> SMALL_YELLOW_TILES, NSE_BUILDING_TAB);
registerBlock("small_cracked_yellow_tiles", () -> SMALL_CRACKED_YELLOW_TILES, NSE_BUILDING_TAB);
@ -783,10 +870,33 @@ public class NSE_Blocks extends NSE_BaseRegistration {
registerBlock("mossy_yellow_bricks_stairs", () -> MOSSY_YELLOW_BRICKS_STAIRS, NSE_BUILDING_TAB);
registerBlock("mossy_yellow_bricks_slab", () -> MOSSY_YELLOW_BRICKS_SLAB, NSE_BUILDING_TAB);
registerBlock("yellow_bricks_cross", () -> YELLOW_BRICKS_CROSS, NSE_BUILDING_TAB);
registerBlock("yellow_bricks_cross_stairs", () -> YELLOW_BRICKS_CROSS_STAIRS, NSE_BUILDING_TAB);
registerBlock("yellow_bricks_cross_slab", () -> YELLOW_BRICKS_CROSS_SLAB, NSE_BUILDING_TAB);
registerBlock("cracked_yellow_bricks_cross", () -> CRACKED_YELLOW_BRICKS_CROSS, NSE_BUILDING_TAB);
registerBlock("cracked_yellow_bricks_cross_stairs", () -> CRACKED_YELLOW_BRICKS_CROSS_STAIRS, NSE_BUILDING_TAB);
registerBlock("cracked_yellow_bricks_cross_slab", () -> CRACKED_YELLOW_BRICKS_CROSS_SLAB, NSE_BUILDING_TAB);
registerBlock("mossy_yellow_bricks_cross", () -> MOSSY_YELLOW_BRICKS_CROSS, NSE_BUILDING_TAB);
registerBlock("mossy_yellow_bricks_cross_stairs", () -> MOSSY_YELLOW_BRICKS_CROSS_STAIRS, NSE_BUILDING_TAB);
registerBlock("mossy_yellow_bricks_cross_slab", () -> MOSSY_YELLOW_BRICKS_CROSS_SLAB, NSE_BUILDING_TAB);
registerBlock("yellow_bricks_dressed", () -> YELLOW_BRICKS_DRESSED, NSE_BUILDING_TAB);
registerBlock("yellow_bricks_dressed_stairs", () -> YELLOW_BRICKS_DRESSED_STAIRS, NSE_BUILDING_TAB);
registerBlock("yellow_bricks_dressed_slab", () -> YELLOW_BRICKS_DRESSED_SLAB, NSE_BUILDING_TAB);
registerBlock("cracked_yellow_bricks_dressed", () -> CRACKED_YELLOW_BRICKS_DRESSED, NSE_BUILDING_TAB);
registerBlock("cracked_yellow_bricks_dressed_stairs", () -> CRACKED_YELLOW_BRICKS_DRESSED_STAIRS, NSE_BUILDING_TAB);
registerBlock("cracked_yellow_bricks_dressed_slab", () -> CRACKED_YELLOW_BRICKS_DRESSED_SLAB, NSE_BUILDING_TAB);
registerBlock("mossy_yellow_bricks_dressed", () -> MOSSY_YELLOW_BRICKS_DRESSED, NSE_BUILDING_TAB);
registerBlock("mossy_yellow_bricks_dressed_stairs", () -> MOSSY_YELLOW_BRICKS_DRESSED_STAIRS, NSE_BUILDING_TAB);
registerBlock("mossy_yellow_bricks_dressed_slab", () -> MOSSY_YELLOW_BRICKS_DRESSED_SLAB, NSE_BUILDING_TAB);
registerBlock("whitewash", () -> WHITEWASH, NSE_BUILDING_TAB);
registerBlock("cracked_whitewash", () -> CRACKED_WHITEWASH, NSE_BUILDING_TAB);
registerBlock("very_cracked_whitewash", () -> VERY_CRACKED_WHITEWASH, NSE_BUILDING_TAB);
registerBlock("concrete_plate", () -> CONCRETE_PLATE, NSE_BUILDING_TAB);
registerBlock("concrete_plate_stairs", () -> CONCRETE_PLATE_STAIRS, NSE_BUILDING_TAB);
registerBlock("concrete_plate_slab", () -> CONCRETE_PLATE_SLAB, 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);
@ -920,10 +1030,19 @@ public class NSE_Blocks extends NSE_BaseRegistration {
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("spruce_jungle_carved_parquet", () -> SPRUCE_JUNGLE_CARVED_PARQUET, NSE_BUILDING_TAB);
registerBlock("spruce_jungle_carved_parquet_stairs", () -> SPRUCE_JUNGLE_CARVED_PARQUET_STAIRS, NSE_BUILDING_TAB);
registerBlock("spruce_jungle_carved_parquet_slab", () -> SPRUCE_JUNGLE_CARVED_PARQUET_SLAB, NSE_BUILDING_TAB);
registerBlock("dark_oak_spruce_carved_parquet", () -> DARK_OAK_SPRUCE_CARVED_PARQUET, NSE_BUILDING_TAB);
registerBlock("dark_oak_spruce_carved_parquet_stairs", () -> DARK_OAK_SPRUCE_CARVED_PARQUET_STAIRS, NSE_BUILDING_TAB);
registerBlock("dark_oak_spruce_carved_parquet_slab", () -> DARK_OAK_SPRUCE_CARVED_PARQUET_SLAB, NSE_BUILDING_TAB);
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("herringbone_spruce_parquet", () -> HERRINGBONE_SPRUCE_PARQUET, NSE_BUILDING_TAB);
registerBlock("herringbone_spruce_parquet_stairs", () -> HERRINGBONE_SPRUCE_PARQUET_STAIRS, NSE_BUILDING_TAB);
registerBlock("herringbone_spruce_parquet_slab", () -> HERRINGBONE_SPRUCE_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);
@ -952,6 +1071,12 @@ public class NSE_Blocks extends NSE_BaseRegistration {
registerBlock("cyan_linoleum", () -> CYAN_LINOLEUM, NSE_BUILDING_TAB);
registerBlock("cyan_linoleum_stairs", () -> CYAN_LINOLEUM_STAIRS, NSE_BUILDING_TAB);
registerBlock("cyan_linoleum_slab", () -> CYAN_LINOLEUM_SLAB, NSE_BUILDING_TAB);
registerBlock("yellow_red_linoleum", () -> YELLOW_RED_LINOLEUM, NSE_BUILDING_TAB);
registerBlock("yellow_red_linoleum_stairs", () -> YELLOW_RED_LINOLEUM_STAIRS, NSE_BUILDING_TAB);
registerBlock("yellow_red_linoleum_slab", () -> YELLOW_RED_LINOLEUM_SLAB, NSE_BUILDING_TAB);
registerBlock("beige_linoleum", () -> BEIGE_LINOLEUM, NSE_BUILDING_TAB);
registerBlock("beige_linoleum_stairs", () -> BEIGE_LINOLEUM_STAIRS, NSE_BUILDING_TAB);
registerBlock("beige_linoleum_slab", () -> BEIGE_LINOLEUM_SLAB, NSE_BUILDING_TAB);
registerBlock("cross_orange_linoleum", () -> CROSS_ORANGE_LINOLEUM, NSE_BUILDING_TAB);
registerBlock("cross_brown_linoleum", () -> CROSS_BROWN_LINOLEUM, NSE_BUILDING_TAB);
@ -959,6 +1084,9 @@ public class NSE_Blocks extends NSE_BaseRegistration {
registerBlock("chiseled_oak_door", () -> CHISELED_OAK_DOOR, NSE_BUILDING_TAB);
registerBlock("chiseled_spruce_door", () -> CHISELED_SPRUCE_DOOR, NSE_BUILDING_TAB);
registerBlock("chiseled_birch_door", () -> CHISELED_BIRCH_DOOR, NSE_BUILDING_TAB);
registerBlock("chiseled_acacia_door", () -> CHISELED_ACACIA_DOOR, NSE_BUILDING_TAB);
registerBlock("leather_lined_chiseled_acacia_door", () -> LEATHER_LINED_CHISELED_ACACIA_DOOR, NSE_BUILDING_TAB);
registerBlock("white_chiseled_birch_door", () -> WHITE_CHISELED_BIRCH_DOOR, NSE_BUILDING_TAB);
registerBlock("white_boundary_marker", () -> WHITE_BOUNDARY_MARKER, NSE_BUILDING_TAB);
registerBlock("light_gray_boundary_marker", () -> LIGHT_GRAY_BOUNDARY_MARKER, NSE_BUILDING_TAB);

9
src/main/java/su/a71/new_soviet/registration/NSE_Sounds.java
View file

@ -8,12 +8,14 @@ import su.a71.new_soviet.NewSoviet;
public class NSE_Sounds extends NSE_BaseRegistration {
public static SoundEvent DICE_SOUND = registerSoundEvent("dice_sound");
public static SoundEvent W_MACHINE_BUTTON_PRESS = registerSoundEvent("w_machine_button_press");
public static SoundEvent SCREWDRIVER_SOUND = registerSoundEvent("screwdriver_sound");
public static SoundEvent PARQUET_WALK = registerSoundEvent("parquet_walk");
public static SoundEvent PARQUET_STEP = registerSoundEvent("parquet_step");
public static final BlockSoundGroup PARQUET_SOUNDS = new BlockSoundGroup(1f, 1f,
BlockSoundGroup.CHERRY_WOOD.getBreakSound(), NSE_Sounds.PARQUET_WALK, BlockSoundGroup.CHERRY_WOOD.getPlaceSound(),
BlockSoundGroup.CHERRY_WOOD.getHitSound(), NSE_Sounds.PARQUET_WALK);
BlockSoundGroup.CHERRY_WOOD.getBreakSound(), NSE_Sounds.PARQUET_STEP, BlockSoundGroup.CHERRY_WOOD.getPlaceSound(),
BlockSoundGroup.CHERRY_WOOD.getHitSound(), NSE_Sounds.PARQUET_STEP);
public static final BlockSoundGroup MEAT_SOUNDS = new BlockSoundGroup(1f, 1f,
BlockSoundGroup.MUD.getBreakSound(), BlockSoundGroup.HONEY.getStepSound(), BlockSoundGroup.MUD.getPlaceSound(),
@ -41,6 +43,7 @@ public class NSE_Sounds extends NSE_BaseRegistration {
public static final SoundEvent SIREN_SOUND = registerSoundEvent("siren_sound");
public static final SoundEvent BELL_SIREN_SOUND = registerSoundEvent("bell_siren_sound");
public static final SoundEvent WOOP_SIREN_SOUND = registerSoundEvent("woop_siren_sound");
public static final SoundEvent KUPLINOV_SIREN_SOUND = registerSoundEvent("kuplinov_siren_sound");
public static final SoundEvent CLOISTER_SIREN_SOUND = registerSoundEvent("cloister_siren_sound");
public static final SoundEvent ELECTRIC_HIT = SoundEvent.of(new Identifier(NewSoviet.MOD_ID, "electric_hit"));