diff --git a/README.md b/README.md index fd96346..fcb28e0 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,2 @@ -# Fabric Example Mod - -## Setup - -For setup instructions please see the [fabric wiki page](https://fabricmc.net/wiki/tutorial:setup) that relates to the IDE that you are using. - -## License - -This template is available under the CC0 license. Feel free to learn from it and incorporate it in your own projects. +# New Soviet Era +Minecraft mod to relive the good old days \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/NSE_Blocks.java b/src/main/java/su/a71/new_soviet/NSE_Blocks.java index ab6f479..962b570 100644 --- a/src/main/java/su/a71/new_soviet/NSE_Blocks.java +++ b/src/main/java/su/a71/new_soviet/NSE_Blocks.java @@ -88,10 +88,11 @@ public class NSE_Blocks { public static final Block SMOOTH_TUFF_TILES = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.TUFF)); - // MISC ===================================== + // Industrial ===================================== public static final Block INDUSTRIAL_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL)); - public static final Block RED_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE)); - public static final Block ORANGE_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE)); + 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 METAL_PLATING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL)); // WOOD/FLOOR ====== public static final Block HERRINGBONE_ACACIA_PLANKS = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD)); @@ -111,7 +112,7 @@ public class NSE_Blocks { public static final Block HERRINGBONE_SPRUCE_PLANKS = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD)); public static final Block CROSS_SPRUCE_PLANKS = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD)); - public static final Block SMALL_HERRINGBONE_PARQUET = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD)); + public static final Block HERRINGBONE_PARQUET = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD)); public static final Block STRAIGHT_PARQUET = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD)); public static final Block SEPARATED_PARQUET = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD)); @@ -233,6 +234,8 @@ public class NSE_Blocks { register("industrial_warning", () -> INDUSTRIAL_WARNING, NSE_TAB); register("red_warning", () -> RED_WARNING, NSE_TAB); register("orange_warning", () -> ORANGE_WARNING, NSE_TAB); + register("metal_plating", () -> METAL_PLATING, NSE_TAB); + register("herringbone_acacia_planks", () -> HERRINGBONE_ACACIA_PLANKS, NSE_TAB); register("cross_acacia_planks", () -> CROSS_ACACIA_PLANKS, NSE_TAB); @@ -251,7 +254,7 @@ public class NSE_Blocks { register("herringbone_spruce_planks", () -> HERRINGBONE_SPRUCE_PLANKS, NSE_TAB); register("cross_spruce_planks", () -> CROSS_SPRUCE_PLANKS, NSE_TAB); - register("small_herringbone_parquet", () -> SMALL_HERRINGBONE_PARQUET, NSE_TAB); + register("herringbone_parquet", () -> HERRINGBONE_PARQUET, NSE_TAB); register("straight_parquet", () -> STRAIGHT_PARQUET, NSE_TAB); register("separated_parquet", () -> SEPARATED_PARQUET, NSE_TAB); diff --git a/src/main/resources/assets/new_soviet/blockstates/herringbone_parquet.json b/src/main/resources/assets/new_soviet/blockstates/herringbone_parquet.json new file mode 100644 index 0000000..4964600 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/herringbone_parquet.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/herringbone_parquet" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/metal_plating.json b/src/main/resources/assets/new_soviet/blockstates/metal_plating.json new file mode 100644 index 0000000..2c86ca8 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/metal_plating.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/metal_plating" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/herringbone_parquet.json b/src/main/resources/assets/new_soviet/models/block/herringbone_parquet.json new file mode 100644 index 0000000..7ea947f --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/herringbone_parquet.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/floor/planks/herringbone_parquet", + "particle": "new_soviet:block/floor/planks/herringbone_parquet" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/industrial_warning.json b/src/main/resources/assets/new_soviet/models/block/industrial_warning.json index fbd6003..94b7925 100644 --- a/src/main/resources/assets/new_soviet/models/block/industrial_warning.json +++ b/src/main/resources/assets/new_soviet/models/block/industrial_warning.json @@ -1,8 +1,8 @@ { "parent": "block/cube_all", "textures": { - "all": "new_soviet:block/warning_stripes/industrial_warning_stripes", - "particle": "new_soviet:block/warning_stripes/industrial_warning_stripes" + "all": "new_soviet:block/industrial/industrial_warning_stripes", + "particle": "new_soviet:block/industrial/industrial_warning_stripes" } } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/metal_plating.json b/src/main/resources/assets/new_soviet/models/block/metal_plating.json new file mode 100644 index 0000000..89b1b6b --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/metal_plating.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/industrial/metal_plating", + "particle": "new_soviet:block/industrial/metal_plating" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/orange_warning.json b/src/main/resources/assets/new_soviet/models/block/orange_warning.json index 394934a..c2dd93c 100644 --- a/src/main/resources/assets/new_soviet/models/block/orange_warning.json +++ b/src/main/resources/assets/new_soviet/models/block/orange_warning.json @@ -1,8 +1,8 @@ { "parent": "block/cube_all", "textures": { - "all": "new_soviet:block/warning_stripes/orange_warning_stripes", - "particle": "new_soviet:block/warning_stripes/orange_warning_stripes" + "all": "new_soviet:block/industrial/orange_warning_stripes", + "particle": "new_soviet:block/industrial/orange_warning_stripes" } } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/red_warning.json b/src/main/resources/assets/new_soviet/models/block/red_warning.json index e94eaab..fced728 100644 --- a/src/main/resources/assets/new_soviet/models/block/red_warning.json +++ b/src/main/resources/assets/new_soviet/models/block/red_warning.json @@ -1,8 +1,8 @@ { "parent": "block/cube_all", "textures": { - "all": "new_soviet:block/warning_stripes/red_warning_stripes", - "particle": "new_soviet:block/warning_stripes/red_warning_stripes" + "all": "new_soviet:block/industrial/red_warning_stripes", + "particle": "new_soviet:block/industrial/red_warning_stripes" } } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/herringbone_parquet.json b/src/main/resources/assets/new_soviet/models/item/herringbone_parquet.json new file mode 100644 index 0000000..6b5844a --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/herringbone_parquet.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/herringbone_parquet" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/metal_plating.json b/src/main/resources/assets/new_soviet/models/item/metal_plating.json new file mode 100644 index 0000000..709780a --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/metal_plating.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/metal_plating" +} + diff --git a/src/main/resources/assets/new_soviet/textures/block/calcite/cracked_calcite_tiles.png b/src/main/resources/assets/new_soviet/textures/block/calcite/cracked_calcite_tiles.png new file mode 100644 index 0000000..4ffef64 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/calcite/cracked_calcite_tiles.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/floor/planks/cross_birch_planks.png b/src/main/resources/assets/new_soviet/textures/block/floor/planks/cross_birch_planks.png new file mode 100644 index 0000000..f5212a5 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/floor/planks/cross_birch_planks.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/floor/planks/cross_crimson_planks.png b/src/main/resources/assets/new_soviet/textures/block/floor/planks/cross_crimson_planks.png new file mode 100644 index 0000000..d48f7a0 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/floor/planks/cross_crimson_planks.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/floor/planks/herringbone_birch_planks.png b/src/main/resources/assets/new_soviet/textures/block/floor/planks/herringbone_birch_planks.png new file mode 100644 index 0000000..a67798b Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/floor/planks/herringbone_birch_planks.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/warning_stripes/industrial_warning_stripes.png b/src/main/resources/assets/new_soviet/textures/block/industrial/industrial_warning_stripes.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/warning_stripes/industrial_warning_stripes.png rename to src/main/resources/assets/new_soviet/textures/block/industrial/industrial_warning_stripes.png diff --git a/src/main/resources/assets/new_soviet/textures/block/metalplating.png b/src/main/resources/assets/new_soviet/textures/block/industrial/metal_plating.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/metalplating.png rename to src/main/resources/assets/new_soviet/textures/block/industrial/metal_plating.png diff --git a/src/main/resources/assets/new_soviet/textures/block/warning_stripes/orange_warning_stripes.png b/src/main/resources/assets/new_soviet/textures/block/industrial/orange_warning_stripes.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/warning_stripes/orange_warning_stripes.png rename to src/main/resources/assets/new_soviet/textures/block/industrial/orange_warning_stripes.png diff --git a/src/main/resources/assets/new_soviet/textures/block/warning_stripes/red_warning_stripes.png b/src/main/resources/assets/new_soviet/textures/block/industrial/red_warning_stripes.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/warning_stripes/red_warning_stripes.png rename to src/main/resources/assets/new_soviet/textures/block/industrial/red_warning_stripes.png