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

Add iron bars

Browse source
This commit is contained in:
Andrew-71 2023-09-30 19:34:47 +03:00
parent 89d822a045
commit c07961af31
42 changed files with 959 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -157,7 +157,7 @@ public class SirenBlock extends HorizontalFacingBlock implements Waterloggable {
@Override
public void appendTooltip(ItemStack stack, @Nullable BlockView world, List<Text> tooltip, TooltipContext options) {
tooltip.add(Text.translatable("block.new_soviet.siren.instruction")); // TODO: Pull keybinds in case user changed RMB to whatever
tooltip.add(Text.translatable("block.new_soviet.siren.instruction")); // TODO: Pull keybindings in case user changed RMB to whatever
super.appendTooltip(stack, world, tooltip, options);
}

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

@ -178,6 +178,9 @@ public class BlockLootTables extends FabricBlockLootTableProvider {
addDrop(NSE_Blocks.BROWN_WALLPAPER);
addDrop(NSE_Blocks.GREEN_WALLPAPER);
addDrop(NSE_Blocks.HANDRAIL);
addDrop(NSE_Blocks.BLUE_IRON_BARS);
addDrop(NSE_Blocks.RUSTY_BLUE_IRON_BARS);
addDrop(NSE_Blocks.VINTAGE_IRON_BARS);
// Drops for furniture/electronics/appliances
addDrop(NSE_Custom.WHITE_PAWN);
@ -202,6 +205,7 @@ public class BlockLootTables extends FabricBlockLootTableProvider {
addDrop(NSE_Custom.VINTAGE_LAMP);
addDrop(NSE_Custom.CEILING_FAN);
addDrop(NSE_Custom.SWITCH);
addDrop(NSE_Custom.DARK_SWITCH);
// Generated stairs and slabs drops
addDrop(NSE_Blocks.SAND_TILES_SLAB);

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

@ -395,6 +395,10 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider {
.add(NSE_Custom.RED_TV)
.add(NSE_Custom.BROWN_TV);
getOrCreateTagBuilder(NSE_Tags.Blocks.SWITCHES)
.add(NSE_Custom.SWITCH)
.add(NSE_Custom.DARK_SWITCH);
getOrCreateTagBuilder(NSE_Tags.Blocks.POST_LAMPS)
.add(NSE_Custom.CAGED_POST_LAMP)
.add(NSE_Custom.VINTAGE_POST_LAMP)

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

@ -4,10 +4,13 @@ package su.a71.new_soviet.datagen;
import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider;
import net.minecraft.block.Block;
import net.minecraft.block.PaneBlock;
import net.minecraft.block.SlabBlock;
import net.minecraft.block.StairsBlock;
import net.minecraft.data.client.*;
import net.minecraft.item.Item;
import net.minecraft.registry.Registries;
import net.minecraft.state.property.Properties;
import net.minecraft.util.Identifier;
import su.a71.new_soviet.registration.NSE_Blocks;
@ -58,6 +61,18 @@ public class ModelGenerator extends FabricModelProvider {
blockStateModelGenerator.blockStateCollector.accept(BlockStateModelGenerator.createStairsBlockState(stairs, stairs_model_inner, stairs_model, stairs_model_outer));
}
// public final void registerPaneFence(BlockStateModelGenerator blockStateModelGenerator, PaneBlock block, String texturePath) {
// TextureMap textureMap = (new TextureMap()).put(TextureKey.PANE, getId(block)).put(TextureKey.EDGE, getSubId(top, "_top"));
// Identifier identifier = Models.TEMPLATE_GLASS_PANE_POST.upload(glassPane, textureMap, this.modelCollector);
// Identifier identifier2 = Models.TEMPLATE_GLASS_PANE_SIDE.upload(glassPane, textureMap, this.modelCollector);
// Identifier identifier3 = Models.TEMPLATE_GLASS_PANE_SIDE_ALT.upload(glassPane, textureMap, this.modelCollector);
// Identifier identifier4 = Models.TEMPLATE_GLASS_PANE_NOSIDE.upload(glassPane, textureMap, this.modelCollector);
// Identifier identifier5 = Models.TEMPLATE_GLASS_PANE_NOSIDE_ALT.upload(glassPane, textureMap, this.modelCollector);
// Item item = glassPane.asItem();
// Models.GENERATED.upload(ModelIds.getItemModelId(item), TextureMap.layer0(glass), this.modelCollector);
// this.blockStateCollector.accept(MultipartBlockStateSupplier.create(glassPane).with(BlockStateVariant.create().put(VariantSettings.MODEL, identifier)).with(When.create().set(Properties.NORTH, true), BlockStateVariant.create().put(VariantSettings.MODEL, identifier2)).with(When.create().set(Properties.EAST, true), BlockStateVariant.create().put(VariantSettings.MODEL, identifier2).put(VariantSettings.Y, VariantSettings.Rotation.R90)).with(When.create().set(Properties.SOUTH, true), BlockStateVariant.create().put(VariantSettings.MODEL, identifier3)).with(When.create().set(Properties.WEST, true), BlockStateVariant.create().put(VariantSettings.MODEL, identifier3).put(VariantSettings.Y, VariantSettings.Rotation.R90)).with(When.create().set(Properties.NORTH, false), BlockStateVariant.create().put(VariantSettings.MODEL, identifier4)).with(When.create().set(Properties.EAST, false), BlockStateVariant.create().put(VariantSettings.MODEL, identifier5)).with(When.create().set(Properties.SOUTH, false), BlockStateVariant.create().put(VariantSettings.MODEL, identifier5).put(VariantSettings.Y, VariantSettings.Rotation.R90)).with(When.create().set(Properties.WEST, false), BlockStateVariant.create().put(VariantSettings.MODEL, identifier4).put(VariantSettings.Y, VariantSettings.Rotation.R270)));
// }
@Override
public void generateBlockStateModels(BlockStateModelGenerator blockStateModelGenerator) {
registerDoor(blockStateModelGenerator, NSE_Blocks.CHISELED_BIRCH_DOOR);

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

@ -423,6 +423,11 @@ public class NSE_Blocks extends NSE_BaseRegistration {
public static final BarrelBlock CRATE = new BarrelBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.CHISELED_BOOKSHELF).nonOpaque().mapColor(MapColor.OAK_TAN).hardness(1.8f));
public static final WallBlock CONCRETE_WALL = new WallBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).mapColor(MapColor.STONE_GRAY));
public static final HandrailBlock HANDRAIL = new HandrailBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.COPPER).hardness(4f).nonOpaque());
public static final PaneBlock BLUE_IRON_BARS = new PaneBlock(FabricBlockSettings.copy(Blocks.IRON_BARS));
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 ==========
public static final Block GREEN_WALLPAPER = new Block(FabricBlockSettings.create().sounds(NSE_Sounds.WALLPAPER_BLOCK_SOUNDS).nonOpaque().mapColor(MapColor.DARK_GREEN).hardness(10f));
public static final Block BROWN_WALLPAPER = new Block(FabricBlockSettings.copy(GREEN_WALLPAPER).mapColor(MapColor.BROWN));
@ -434,8 +439,6 @@ public class NSE_Blocks extends NSE_BaseRegistration {
public static final Block MEAT_TEETH = new Block(FabricBlockSettings.copy(MEAT));
public static final SnowBlock PURPLE_GOO = new SnowBlock(FabricBlockSettings.copy(MEAT).mapColor(MapColor.PURPLE).hardness(1.2f).nonOpaque());
public static final HandrailBlock HANDRAIL = new HandrailBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.COPPER).hardness(4f).nonOpaque());
private static final ItemGroup NSE_BUILDING_TAB = FabricItemGroup.builder()
.icon(() -> new ItemStack(CALCITE_TILES))
.displayName(Text.translatable("itemGroup.new_soviet.building_blocks"))
@ -848,6 +851,11 @@ public class NSE_Blocks extends NSE_BaseRegistration {
registerBlock("crate", () -> CRATE, NSE_BUILDING_TAB);
registerBlock("concrete_wall", () -> CONCRETE_WALL, NSE_BUILDING_TAB); // FIXME: 29.08.2023 This wall's top texture is a bit broken
registerBlock("handrail", () -> HANDRAIL, NSE_BUILDING_TAB);
registerBlock("blue_iron_bars", () -> BLUE_IRON_BARS, NSE_BUILDING_TAB);
registerBlock("rusty_blue_iron_bars", () -> RUSTY_BLUE_IRON_BARS, NSE_BUILDING_TAB);
registerBlock("vintage_iron_bars", () -> VINTAGE_IRON_BARS, NSE_BUILDING_TAB);
registerBlock("green_wallpaper", () -> GREEN_WALLPAPER, NSE_BUILDING_TAB);
registerBlock("brown_wallpaper", () -> BROWN_WALLPAPER, NSE_BUILDING_TAB);
registerBlock("beige_wallpaper", () -> BEIGE_WALLPAPER, NSE_BUILDING_TAB);
@ -856,7 +864,6 @@ public class NSE_Blocks extends NSE_BaseRegistration {
registerBlock("meat_eye", () -> MEAT_EYE, NSE_BUILDING_TAB);
registerBlock("meat_teeth", () -> MEAT_TEETH, NSE_BUILDING_TAB);
registerBlock("purple_goo", () -> PURPLE_GOO, NSE_BUILDING_TAB);
registerBlock("handrail", () -> HANDRAIL, NSE_BUILDING_TAB);
flammableInit();
}

1
src/main/java/su/a71/new_soviet/registration/NSE_Tags.java
View file

@ -10,6 +10,7 @@ public class NSE_Tags extends NSE_BaseRegistration{
public static final TagKey<Block> TV = createBlockTag("tv");
public static final TagKey<Block> POST_LAMPS = createBlockTag("post_lamps");
public static final TagKey<Block> SWITCHES = createBlockTag("switches");
}
public static class Items {