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

Fix brick filenames and improve block model files

Browse source
This commit is contained in:
Andrew-71 2023-08-29 16:34:50 +03:00
parent 04b8143ff7
commit 9ba3a3cf76
171 changed files with 154 additions and 404 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,6 +20,7 @@ public class NSE_Blocks extends NSE_BaseRegistration {
// BUILDING BRICKS/TILES ====================
public static final Block SAND_TILES = new Block(FabricBlockSettings.create().sounds(NSE_Sounds.SAND_TILES_SOUNDS).hardness(1.5f).requiresTool().resistance(6f).mapColor(MapColor.TERRACOTTA_BROWN));
public static final StairsBlock SAND_TILES_STAIRS = new StairsBlock(SAND_TILES.getDefaultState(), FabricBlockSettings.copy(SAND_TILES));
public static final SlabBlock SAND_TILES_SLAB = new SlabBlock(FabricBlockSettings.copy(SAND_TILES));
public static final Block CRACKED_SAND_TILES = new Block(FabricBlockSettings.copy(SAND_TILES));
public static final Block MOSSY_SAND_TILES = new Block(FabricBlockSettings.copy(SAND_TILES));
public static final Block SMALL_SAND_TILES = new Block(FabricBlockSettings.copy(SAND_TILES));
@ -227,7 +228,7 @@ public class NSE_Blocks extends NSE_BaseRegistration {
public static final Block MEAT = new Block(FabricBlockSettings.create().velocityMultiplier(0.8f).sounds(NSE_Sounds.MEAT_SOUNDS).nonOpaque().mapColor(MapColor.DARK_RED).hardness(8f));
public static final Block MEAT_EYE = new Block(FabricBlockSettings.copy(MEAT));
public static final Block MEAT_TEETH = new Block(FabricBlockSettings.copy(MEAT));
public static final SnowBlock PURPLE_GOO = new SnowBlock(FabricBlockSettings.copy(MEAT).hardness(1.2f).nonOpaque());
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());
@ -240,6 +241,7 @@ public class NSE_Blocks extends NSE_BaseRegistration {
Registry.register(Registries.ITEM_GROUP, new Identifier("new_soviet", "building_blocks"), NSE_BUILDING_TAB);
registerBlock("sand_tiles", () -> SAND_TILES, NSE_BUILDING_TAB);
registerBlock("sand_tiles_stairs", () -> SAND_TILES_STAIRS, NSE_BUILDING_TAB);
registerBlock("sand_tiles_slab", () -> SAND_TILES_SLAB, NSE_BUILDING_TAB);
registerBlock("cracked_sand_tiles", () -> CRACKED_SAND_TILES, NSE_BUILDING_TAB);
registerBlock("mossy_sand_tiles", () -> MOSSY_SAND_TILES, NSE_BUILDING_TAB);
registerBlock("small_sand_tiles", () -> SMALL_SAND_TILES, NSE_BUILDING_TAB);
@ -251,7 +253,7 @@ public class NSE_Blocks extends NSE_BaseRegistration {
registerBlock("cracked_sand_bricks", () -> CRACKED_SAND_BRICKS, NSE_BUILDING_TAB);
registerBlock("mossy_sand_bricks", () -> MOSSY_SAND_BRICKS, NSE_BUILDING_TAB);
registerBlock("big_sand_bricks", () -> BIG_SAND_BRICKS, NSE_BUILDING_TAB);
//brick
registerBlock("brick_tiles", () -> BRICK_TILES, NSE_BUILDING_TAB);
registerBlock("cracked_brick_tiles", () -> CRACKED_BRICK_TILES, NSE_BUILDING_TAB);
registerBlock("mossy_brick_tiles", () -> MOSSY_BRICK_TILES, NSE_BUILDING_TAB);
@ -265,6 +267,7 @@ public class NSE_Blocks extends NSE_BaseRegistration {
registerBlock("red_bricks", () -> RED_BRICKS, NSE_BUILDING_TAB);
registerBlock("cracked_red_bricks", () -> CRACKED_RED_BRICKS, NSE_BUILDING_TAB);
registerBlock("mossy_red_bricks", () -> MOSSY_RED_BRICKS, NSE_BUILDING_TAB);
registerBlock("teal_tiles", () -> TEAL_TILES, NSE_BUILDING_TAB);
registerBlock("cracked_teal_tiles", () -> CRACKED_TEAL_TILES, NSE_BUILDING_TAB);
registerBlock("mossy_teal_tiles", () -> MOSSY_TEAL_TILES, NSE_BUILDING_TAB);
@ -291,32 +294,36 @@ public class NSE_Blocks extends NSE_BaseRegistration {
registerBlock("small_cracked_aquamarine_tiles", () -> SMALL_CRACKED_AQUAMARINE_TILES, NSE_BUILDING_TAB);
registerBlock("glazed_aquamarine_tiles", () -> GLAZED_AQUAMARINE_TILES, NSE_BUILDING_TAB);
registerBlock("cracked_glazed_aquamarine_tiles", () -> CRACKED_GLAZED_AQUAMARINE_TILES, NSE_BUILDING_TAB);
registerBlock("small_diorite_tiles", () -> SMALL_DIORITE_TILES, NSE_BUILDING_TAB);
registerBlock("small_cracked_diorite_tiles", () -> SMALL_CRACKED_DIORITE_TILES, NSE_BUILDING_TAB);
registerBlock("big_diorite_tiles", () -> BIG_DIORITE_TILES, NSE_BUILDING_TAB);
registerBlock("diorite_bricks", () -> DIORITE_BRICKS, NSE_BUILDING_TAB);
registerBlock("cracked_diorite_bricks", () -> CRACKED_DIORITE_BRICKS, NSE_BUILDING_TAB);
registerBlock("mossy_diorite_bricks", () -> MOSSY_DIORITE_BRICKS, NSE_BUILDING_TAB);
registerBlock("calcite_tiles", () -> CALCITE_TILES, NSE_BUILDING_TAB);
registerBlock("cracked_calcite_tiles", () -> CRACKED_CALCITE_TILES, NSE_BUILDING_TAB);
registerBlock("mossy_calcite_tiles", () -> MOSSY_CALCITE_TILES, NSE_BUILDING_TAB);
registerBlock("diagonal_calcite_tiles", () -> DIAGONAL_CALCITE_TILES, NSE_BUILDING_TAB);
//nii walls
registerBlock("nii_wall_1", () -> NII_WALL_1, NSE_BUILDING_TAB);
registerBlock("cracked_nii_wall_1", () -> CRACKED_NII_WALL_1, NSE_BUILDING_TAB);
registerBlock("nii_wall_2", () -> NII_WALL_2, NSE_BUILDING_TAB);
registerBlock("nii_wall_3", () -> NII_WALL_3, NSE_BUILDING_TAB);
//dripstone
registerBlock("dripstone_tiles", () -> DRIPSTONE_TILES, NSE_BUILDING_TAB);
registerBlock("cracked_dripstone_tiles", () -> CRACKED_DRIPSTONE_TILES, NSE_BUILDING_TAB);
registerBlock("mossy_dripstone_tiles", () -> MOSSY_DRIPSTONE_TILES, NSE_BUILDING_TAB);
registerBlock("dripstone_bricks", () -> DRIPSTONE_BRICKS, NSE_BUILDING_TAB);
registerBlock("deepslate_tiles", () -> DEEPSLATE_TILES, NSE_BUILDING_TAB);
registerBlock("cracked_deepslate_tiles", () -> CRACKED_DEEPSLATE_TILES, NSE_BUILDING_TAB);
registerBlock("mossy_deepslate_tiles", () -> MOSSY_DEEPSLATE_TILES, NSE_BUILDING_TAB);
registerBlock("small_deepslate_tiles", () -> SMALL_DEEPSLATE_TILES, NSE_BUILDING_TAB);
registerBlock("small_cracked_deepslate_tiles", () -> SMALL_CRACKED_DEEPSLATE_TILES, NSE_BUILDING_TAB);
registerBlock("diagonal_deepslate_tiles", () -> DIAGONAL_DEEPSLATE_TILES, NSE_BUILDING_TAB);
registerBlock("light_blue_tiles", () -> LIGHT_BLUE_TILES, NSE_BUILDING_TAB);
registerBlock("cracked_light_blue_tiles", () -> CRACKED_LIGHT_BLUE_TILES, NSE_BUILDING_TAB);
registerBlock("mossy_light_blue_tiles", () -> MOSSY_LIGHT_BLUE_TILES, NSE_BUILDING_TAB);
@ -328,12 +335,15 @@ public class NSE_Blocks extends NSE_BaseRegistration {
registerBlock("light_blue_bricks", () -> LIGHT_BLUE_BRICKS, NSE_BUILDING_TAB);
registerBlock("cracked_light_blue_bricks", () -> CRACKED_LIGHT_BLUE_BRICKS, NSE_BUILDING_TAB);
registerBlock("mossy_light_blue_bricks", () -> MOSSY_LIGHT_BLUE_BRICKS, NSE_BUILDING_TAB);
registerBlock("big_granite_tiles", () -> BIG_GRANITE_TILES, NSE_BUILDING_TAB);
registerBlock("small_granite_tiles", () -> SMALL_GRANITE_TILES, NSE_BUILDING_TAB);
registerBlock("small_cracked_granite_tiles", () -> SMALL_CRACKED_GRANITE_TILES, NSE_BUILDING_TAB);
registerBlock("green_white_tiles", () -> GREEN_WHITE_TILES, NSE_BUILDING_TAB);
registerBlock("cracked_green_white_tiles", () -> CRACKED_GREEN_WHITE_TILES, NSE_BUILDING_TAB);
registerBlock("mossy_green_white_tiles", () -> MOSSY_GREEN_WHITE_TILES, NSE_BUILDING_TAB);
registerBlock("tuff_tiles", () -> TUFF_TILES, NSE_BUILDING_TAB);
registerBlock("cracked_tuff_tiles", () -> CRACKED_TUFF_TILES, NSE_BUILDING_TAB);
registerBlock("mossy_tuff_tiles", () -> MOSSY_TUFF_TILES, NSE_BUILDING_TAB);
@ -341,6 +351,7 @@ public class NSE_Blocks extends NSE_BaseRegistration {
registerBlock("tuff_bricks", () -> TUFF_BRICKS, NSE_BUILDING_TAB);
registerBlock("cracked_tuff_bricks", () -> CRACKED_TUFF_BRICKS, NSE_BUILDING_TAB);
registerBlock("mossy_tuff_bricks", () -> MOSSY_TUFF_BRICKS, NSE_BUILDING_TAB);
registerBlock("small_white_tiles", () -> SMALL_WHITE_TILES, NSE_BUILDING_TAB);
registerBlock("small_cracked_white_tiles", () -> SMALL_CRACKED_WHITE_TILES, NSE_BUILDING_TAB);
registerBlock("glazed_white_tiles", () -> GLAZED_WHITE_TILES, NSE_BUILDING_TAB);

3
src/main/java/su/a71/new_soviet/registration/NSE_Items.java
View file

@ -31,9 +31,10 @@ public class NSE_Items extends NSE_BaseRegistration {
public static final DiceItem DICE_D20 = new DiceItem(20, "item.new_soviet.dice_d20.tooltip", new Item.Settings().maxCount(6));
public static final Item LIGHT_BULB = new Item(new Item.Settings());
public static final Item CIGARETTE_BUTT = new Item(new Item.Settings());
public static final Item CIGARETTE_BUTT = new Item(new Item.Settings());
public static final CigaretteItem CIGARETTE = new CigaretteItem(200, NSE_Items.CIGARETTE_BUTT, "item.new_soviet.tooltip.salute", new Item.Settings());
// public static final MusicDiscItem BATTLE_IS_GOING_AGAIN = new MusicDiscItem(1, NSE_Sounds.MUSIC_LENIN, 123)
private static final ItemGroup NSE_ITEMS_TAB = FabricItemGroup.builder()
.icon(() -> new ItemStack(SICKLE))