We need to build a wall

This commit is contained in:
Andrew-71 2023-06-26 20:19:23 +03:00
parent 7c91739784
commit c7268d52a2
43 changed files with 339 additions and 10 deletions

View file

@ -5,12 +5,14 @@ import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup;
import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.WallBlock;
import net.minecraft.item.BlockItem; import net.minecraft.item.BlockItem;
import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.registry.Registries; import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry; import net.minecraft.registry.Registry;
import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKey;
import net.minecraft.registry.tag.BlockTags;
import net.minecraft.sound.BlockSoundGroup; import net.minecraft.sound.BlockSoundGroup;
import net.minecraft.text.Text; import net.minecraft.text.Text;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
@ -86,6 +88,11 @@ public class NSE_Blocks {
public static final Block BIG_GRANITE_TILES = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE)); public static final Block BIG_GRANITE_TILES = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE));
public static final Block SMALL_GRANITE_TILES = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE)); public static final Block SMALL_GRANITE_TILES = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE));
public static final Block GREEN_WHITE_TILES = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE));
public static final Block CRACKED_GREEN_WHITE_TILES = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE));
public static final Block MOSSY_GREEN_WHITE_TILES = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE));
// TODO: There are far more of these
public static final Block SMOOTH_TUFF_TILES = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.TUFF)); public static final Block SMOOTH_TUFF_TILES = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.TUFF));
// Industrial ===================================== // Industrial =====================================
@ -93,6 +100,7 @@ public class NSE_Blocks {
public static final Block RED_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL)); public static final Block RED_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL));
public static final Block ORANGE_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL)); public static final Block ORANGE_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL));
public static final Block METAL_PLATING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL)); public static final Block METAL_PLATING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL));
public static final WallBlock CONCRETE_WALL = new WallBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE));
// WOOD/FLOOR ====== // WOOD/FLOOR ======
public static final Block HERRINGBONE_ACACIA_PLANKS = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD)); public static final Block HERRINGBONE_ACACIA_PLANKS = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD));
@ -117,15 +125,15 @@ public class NSE_Blocks {
public static final Block SEPARATED_PARQUET = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD)); public static final Block SEPARATED_PARQUET = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD));
//TODO: Wool or wood? //TODO: Wool or wood?
public static final Block GREEN_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOL)); public static final Block GREEN_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD));
public static final Block BLUE_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOL)); public static final Block BLUE_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD));
public static final Block RED_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOL)); public static final Block RED_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD));
public static final Block GRAY_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOL)); public static final Block GRAY_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD));
public static final Block ORANGE_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOL)); public static final Block ORANGE_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD));
public static final Block BROWN_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOL)); public static final Block BROWN_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD));
public static final Block CYAN_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOL)); public static final Block CYAN_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD));
public static final Block CROSS_ORANGE_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOL)); public static final Block CROSS_ORANGE_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD));
public static final Block CROSS_BROWN_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOL)); public static final Block CROSS_BROWN_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD));
// Concrete // Concrete
//RED_CONCRETE //RED_CONCRETE
@ -229,13 +237,16 @@ public class NSE_Blocks {
register("mossy_light_blue_bricks", () -> MOSSY_LIGHT_BLUE_BRICKS, NSE_TAB); register("mossy_light_blue_bricks", () -> MOSSY_LIGHT_BLUE_BRICKS, NSE_TAB);
register("big_granite_tiles", () -> BIG_GRANITE_TILES, NSE_TAB); register("big_granite_tiles", () -> BIG_GRANITE_TILES, NSE_TAB);
register("small_granite_tiles", () -> SMALL_GRANITE_TILES, NSE_TAB); register("small_granite_tiles", () -> SMALL_GRANITE_TILES, NSE_TAB);
register("green_white_tiles", () -> GREEN_WHITE_TILES, NSE_TAB);
register("cracked_green_white_tiles", () -> CRACKED_GREEN_WHITE_TILES, NSE_TAB);
register("mossy_green_white_tiles", () -> MOSSY_GREEN_WHITE_TILES, NSE_TAB);
register("smooth_tuff_tiles", () -> SMOOTH_TUFF_TILES, NSE_TAB); register("smooth_tuff_tiles", () -> SMOOTH_TUFF_TILES, NSE_TAB);
register("industrial_warning", () -> INDUSTRIAL_WARNING, NSE_TAB); register("industrial_warning", () -> INDUSTRIAL_WARNING, NSE_TAB);
register("red_warning", () -> RED_WARNING, NSE_TAB); register("red_warning", () -> RED_WARNING, NSE_TAB);
register("orange_warning", () -> ORANGE_WARNING, NSE_TAB); register("orange_warning", () -> ORANGE_WARNING, NSE_TAB);
register("metal_plating", () -> METAL_PLATING, NSE_TAB); register("metal_plating", () -> METAL_PLATING, NSE_TAB);
register("concrete_wall", () -> CONCRETE_WALL, NSE_TAB); // TODO: Broken
register("herringbone_acacia_planks", () -> HERRINGBONE_ACACIA_PLANKS, NSE_TAB); register("herringbone_acacia_planks", () -> HERRINGBONE_ACACIA_PLANKS, NSE_TAB);
register("cross_acacia_planks", () -> CROSS_ACACIA_PLANKS, NSE_TAB); register("cross_acacia_planks", () -> CROSS_ACACIA_PLANKS, NSE_TAB);

View file

@ -0,0 +1,90 @@
{
"multipart": [
{
"when": {
"up": "true"
},
"apply": {
"model": "new_soviet:block/concrete_wall_post"
}
},
{
"when": {
"north": "low"
},
"apply": {
"model": "new_soviet:block/concrete_wall_side",
"uvlock": true
}
},
{
"when": {
"east": "low"
},
"apply": {
"model": "new_soviet:block/concrete_wall_side",
"y": 90,
"uvlock": true
}
},
{
"when": {
"south": "low"
},
"apply": {
"model": "new_soviet:block/concrete_wall_side",
"y": 180,
"uvlock": true
}
},
{
"when": {
"west": "low"
},
"apply": {
"model": "new_soviet:block/concrete_wall_side",
"y": 270,
"uvlock": true
}
},
{
"when": {
"north": "tall"
},
"apply": {
"model": "new_soviet:block/concrete_wall_side_tall",
"uvlock": true
}
},
{
"when": {
"east": "tall"
},
"apply": {
"model": "new_soviet:block/concrete_wall_side_tall",
"y": 90,
"uvlock": true
}
},
{
"when": {
"south": "tall"
},
"apply": {
"model": "new_soviet:block/concrete_wall_side_tall",
"y": 180,
"uvlock": true
}
},
{
"when": {
"west": "tall"
},
"apply": {
"model": "new_soviet:block/concrete_wall_side_tall",
"y": 270,
"uvlock": true
}
}
]
}

View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "new_soviet:block/cracked_green_white_tiles"
}
}
}

View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "new_soviet:block/cracked_teal_tiles"
}
}
}

View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "new_soviet:block/green_white_tiles"
}
}
}

View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "new_soviet:block/mossy_green_white_tiles"
}
}
}

View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "new_soviet:block/mossy_teal_tiles"
}
}
}

View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "new_soviet:block/separated_parquet"
}
}
}

View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "new_soviet:block/small_cracked_teal_tiles"
}
}
}

View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "new_soviet:block/small_teal_tiles"
}
}
}

View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "new_soviet:block/straight_parquet"
}
}
}

View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "new_soviet:block/teal_tiles"
}
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/wall_inventory",
"textures": {
"wall": "new_soviet:block/industrial/concrete_wall"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/template_wall_post",
"textures": {
"wall": "new_soviet:block/industrial/concrete_wall"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/template_wall_side",
"textures": {
"wall": "new_soviet:block/industrial/concrete_wall"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/template_wall_side_tall",
"textures": {
"wall": "new_soviet:block/industrial/concrete_wall"
}
}

View file

@ -0,0 +1,8 @@
{
"parent": "block/cube_all",
"textures": {
"all": "new_soviet:block/green_white/cracked_green_white_tiles",
"particle": "new_soviet:block/green_white/cracked_green_white_tiles"
}
}

View file

@ -0,0 +1,8 @@
{
"parent": "block/cube_all",
"textures": {
"all": "new_soviet:block/teal/cracked_teal_tiles",
"particle": "new_soviet:block/teal/cracked_teal_tiles"
}
}

View file

@ -0,0 +1,8 @@
{
"parent": "block/cube_all",
"textures": {
"all": "new_soviet:block/green_white/green_white_tiles",
"particle": "new_soviet:block/green_white/green_white_tiles"
}
}

View file

@ -0,0 +1,8 @@
{
"parent": "block/cube_all",
"textures": {
"all": "new_soviet:block/green_white/mossy_green_white_tiles",
"particle": "new_soviet:block/green_white/mossy_green_white_tiles"
}
}

View file

@ -0,0 +1,9 @@
{
"parent": "block/cube_all",
"textures": {
"all": "new_soviet:block/teal/mossy_teal_tiles",
"particle": "new_soviet:block/teal/mossy_teal_tiles"
}
}

View file

@ -0,0 +1,9 @@
{
"parent": "block/cube_all",
"textures": {
"all": "new_soviet:block/floor/planks/separated_parquet",
"particle": "new_soviet:block/floor/planks/separated_parquet"
}
}

View file

@ -0,0 +1,9 @@
{
"parent": "block/cube_all",
"textures": {
"all": "new_soviet:block/teal/small_cracked_teal_tiles",
"particle": "new_soviet:block/teal/small_cracked_teal_tiles"
}
}

View file

@ -0,0 +1,9 @@
{
"parent": "block/cube_all",
"textures": {
"all": "new_soviet:block/teal/small_teal_tiles",
"particle": "new_soviet:block/teal/small_teal_tiles"
}
}

View file

@ -0,0 +1,9 @@
{
"parent": "block/cube_all",
"textures": {
"all": "new_soviet:block/floor/planks/straight_parquet",
"particle": "new_soviet:block/floor/planks/straight_parquet"
}
}

View file

@ -0,0 +1,9 @@
{
"parent": "block/cube_all",
"textures": {
"all": "new_soviet:block/teal/teal_tiles",
"particle": "new_soviet:block/teal/teal_tiles"
}
}

View file

@ -0,0 +1,3 @@
{
"parent": "new_soviet:block/concrete_wall_inventory"
}

View file

@ -0,0 +1,4 @@
{
"parent": "new_soviet:block/cracked_green_white_tiles"
}

View file

@ -0,0 +1,4 @@
{
"parent": "new_soviet:block/cracked_teal_tiles"
}

View file

@ -0,0 +1,4 @@
{
"parent": "new_soviet:block/green_white_tiles"
}

View file

@ -0,0 +1,4 @@
{
"parent": "new_soviet:block/mossy_green_white_tiles"
}

View file

@ -0,0 +1,4 @@
{
"parent": "new_soviet:block/mossy_teal_tiles"
}

View file

@ -0,0 +1,4 @@
{
"parent": "new_soviet:block/separated_parquet"
}

View file

@ -0,0 +1,4 @@
{
"parent": "new_soviet:block/small_cracked_teal_tiles"
}

View file

@ -0,0 +1,4 @@
{
"parent": "new_soviet:block/small_teal_tiles"
}

View file

@ -0,0 +1,4 @@
{
"parent": "new_soviet:block/straight_parquet"
}

View file

@ -0,0 +1,4 @@
{
"parent": "new_soviet:block/teal_tiles"
}

View file

@ -0,0 +1,5 @@
{
"values": [
"new_soviet:concrete_wall"
]
}