From aec7840c26ba911080a6e5c5c57d45c957a2345f Mon Sep 17 00:00:00 2001 From: Andrew-71 Date: Sun, 13 Aug 2023 22:26:22 +0300 Subject: [PATCH] Oops did I miss something? --- CHANGES.txt | 5 + .../su/a71/new_soviet/DataGeneration.java | 206 ++++++- .../assets/new_soviet/models/block/crate.json | 506 +++++++++++++++++- .../block/red/cracked_glazed_red_tiles.png | Bin 521 -> 513 bytes .../research_institute/cracked_nii_wall_1.png | Bin 851 -> 502 bytes .../block/yellow/cracked_yellow_tiles.png | Bin 353 -> 0 bytes 6 files changed, 692 insertions(+), 25 deletions(-) create mode 100644 CHANGES.txt delete mode 100644 src/main/resources/assets/new_soviet/textures/block/yellow/cracked_yellow_tiles.png diff --git a/CHANGES.txt b/CHANGES.txt new file mode 100644 index 0000000..cd7a044 --- /dev/null +++ b/CHANGES.txt @@ -0,0 +1,5 @@ +Изменения от изначальной загрузки + +* правила пирата номер 1, никогда не говори что украл. "Лицензию" звуков убрал +* вернул улучшенную мину +* SwitchBlock это на 90% LeverBlock, добавил иерархию ООП. Также починил пару вещей связанных с ним. diff --git a/src/main/java/su/a71/new_soviet/DataGeneration.java b/src/main/java/su/a71/new_soviet/DataGeneration.java index 19ae9e9..bb52b0a 100644 --- a/src/main/java/su/a71/new_soviet/DataGeneration.java +++ b/src/main/java/su/a71/new_soviet/DataGeneration.java @@ -9,6 +9,7 @@ import net.fabricmc.fabric.api.datagen.v1.provider.FabricBlockLootTableProvider; import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider; import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; +import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.data.client.BlockStateModelGenerator; import net.minecraft.data.client.ItemModelGenerator; @@ -26,6 +27,7 @@ import net.minecraft.util.Util; import su.a71.new_soviet.registration.NSE_Blocks; import su.a71.new_soviet.registration.NSE_Custom; import su.a71.new_soviet.registration.NSE_Items; +import su.a71.new_soviet.util.NSE_Tags; import java.util.List; import java.util.concurrent.CompletableFuture; @@ -42,6 +44,15 @@ public class DataGeneration implements DataGeneratorEntrypoint { public void generate() { // Drops for building blocks addDrop(NSE_Blocks.SAND_TILES); + addDrop(NSE_Blocks.NII_FLOOR); + addDrop(NSE_Blocks.BIG_GREEN_TILES); + addDrop(NSE_Blocks.BIG_GREEN_TILES_CRACKED); + addDrop(NSE_Blocks.GREEN_BRICKS); + addDrop(NSE_Blocks.CRACKED_GREEN_BRICKS); + addDrop(NSE_Blocks.MOSSY_GREEN_BRICKS); + addDrop(NSE_Blocks.GREEN_BRICKS_2); + addDrop(NSE_Blocks.CRACKED_GREEN_BRICKS_2); + addDrop(NSE_Blocks.MOSSY_GREEN_BRICKS_2); addDrop(NSE_Blocks.CRACKED_SAND_TILES); addDrop(NSE_Blocks.MOSSY_SAND_TILES); addDrop(NSE_Blocks.SMALL_SAND_TILES); @@ -53,6 +64,16 @@ public class DataGeneration implements DataGeneratorEntrypoint { addDrop(NSE_Blocks.CRACKED_SAND_BRICKS); addDrop(NSE_Blocks.MOSSY_SAND_BRICKS); addDrop(NSE_Blocks.BIG_SAND_BRICKS); + //bricks + addDrop(NSE_Blocks.BRICK_TILES); + addDrop(NSE_Blocks.CRACKED_BRICK_TILES); + addDrop(NSE_Blocks.MOSSY_BRICK_TILES); + addDrop(NSE_Blocks.DIRTY_BRICK_TILES); + addDrop(NSE_Blocks.DARK_BRICK_TILES); + addDrop(NSE_Blocks.CRACKED_DARK_BRICK_TILES); + addDrop(NSE_Blocks.MOSSY_DARK_BRICK_TILES); + addDrop(NSE_Blocks.DIRTY_DARK_BRICK_TILES); + //teal addDrop(NSE_Blocks.TEAL_TILES); addDrop(NSE_Blocks.CRACKED_TEAL_TILES); addDrop(NSE_Blocks.MOSSY_TEAL_TILES); @@ -79,6 +100,12 @@ public class DataGeneration implements DataGeneratorEntrypoint { addDrop(NSE_Blocks.CRACKED_CALCITE_TILES); addDrop(NSE_Blocks.MOSSY_CALCITE_TILES); addDrop(NSE_Blocks.DIAGONAL_CALCITE_TILES); + //nii walls + addDrop(NSE_Blocks.NII_WALL_1); + addDrop(NSE_Blocks.CRACKED_NII_WALL_1); + addDrop(NSE_Blocks.NII_WALL_2); + addDrop(NSE_Blocks.NII_WALL_3); + //dripstone addDrop(NSE_Blocks.DRIPSTONE_TILES); addDrop(NSE_Blocks.CRACKED_DRIPSTONE_TILES); addDrop(NSE_Blocks.MOSSY_DRIPSTONE_TILES); @@ -92,6 +119,7 @@ public class DataGeneration implements DataGeneratorEntrypoint { addDrop(NSE_Blocks.LIGHT_BLUE_TILES); addDrop(NSE_Blocks.CRACKED_LIGHT_BLUE_TILES); addDrop(NSE_Blocks.MOSSY_LIGHT_BLUE_TILES); + addDrop(NSE_Blocks.VARIATED_LIGHT_BLUE_TILES); addDrop(NSE_Blocks.SMALL_LIGHT_BLUE_TILES); addDrop(NSE_Blocks.SMALL_CRACKED_LIGHT_BLUE_TILES); addDrop(NSE_Blocks.GLAZED_LIGHT_BLUE_TILES); @@ -170,6 +198,18 @@ public class DataGeneration implements DataGeneratorEntrypoint { addDrop(NSE_Blocks.WHITEWASH); addDrop(NSE_Blocks.CRACKED_WHITEWASH); addDrop(NSE_Blocks.VERY_CRACKED_WHITEWASH); + addDrop(NSE_Blocks.SMALL_YELLOW_TILES); + addDrop(NSE_Blocks.SMALL_CRACKED_YELLOW_TILES); + addDrop(NSE_Blocks.MEAT); + addDrop(NSE_Blocks.MEAT_EYE); + addDrop(NSE_Blocks.MEAT_TEETH); + addDrop(NSE_Blocks.CHISELED_BIRCH_DOOR); + addDrop(NSE_Blocks.CHISELED_MANGROVE_DOOR); + addDrop(NSE_Blocks.CHISELED_OAK_DOOR); + addDrop(NSE_Blocks.CHISELED_SPRUCE_DOOR); + addDrop(NSE_Blocks.BEIGE_WALLPAPER); + addDrop(NSE_Blocks.BROWN_WALLPAPER); + addDrop(NSE_Blocks.GREEN_WALLPAPER); // Drops for furniture/electronics/appliances addDrop(NSE_Custom.TV); @@ -179,7 +219,7 @@ public class DataGeneration implements DataGeneratorEntrypoint { addDrop(NSE_Custom.SIREN); addDrop(NSE_Custom.LAMP); addDrop(NSE_Custom.CEILING_FAN); - addDrop(NSE_Custom.LANDMINE); + addDrop(NSE_Custom.SWITCH); } } @@ -194,6 +234,15 @@ public class DataGeneration implements DataGeneratorEntrypoint { // Blocks mined with a pickaxe getOrCreateTagBuilder(BlockTags.PICKAXE_MINEABLE) .add(NSE_Blocks.SAND_TILES) + .add(NSE_Blocks.NII_FLOOR) + .add(NSE_Blocks.BIG_GREEN_TILES) + .add(NSE_Blocks.BIG_GREEN_TILES_CRACKED) + .add(NSE_Blocks.GREEN_BRICKS) + .add(NSE_Blocks.CRACKED_GREEN_BRICKS) + .add(NSE_Blocks.MOSSY_GREEN_BRICKS) + .add(NSE_Blocks.GREEN_BRICKS_2) + .add(NSE_Blocks.CRACKED_GREEN_BRICKS_2) + .add(NSE_Blocks.MOSSY_GREEN_BRICKS_2) .add(NSE_Blocks.CRACKED_SAND_TILES) .add(NSE_Blocks.MOSSY_SAND_TILES) .add(NSE_Blocks.SMALL_SAND_TILES) @@ -205,6 +254,21 @@ public class DataGeneration implements DataGeneratorEntrypoint { .add(NSE_Blocks.CRACKED_SAND_BRICKS) .add(NSE_Blocks.MOSSY_SAND_BRICKS) .add(NSE_Blocks.BIG_SAND_BRICKS) + //bricks + .add(NSE_Blocks.BRICK_TILES) + .add(NSE_Blocks.CRACKED_BRICK_TILES) + .add(NSE_Blocks.MOSSY_BRICK_TILES) + .add(NSE_Blocks.DIRTY_BRICK_TILES) + .add(NSE_Blocks.DARK_BRICK_TILES) + .add(NSE_Blocks.CRACKED_DARK_BRICK_TILES) + .add(NSE_Blocks.MOSSY_DARK_BRICK_TILES) + .add(NSE_Blocks.DIRTY_DARK_BRICK_TILES) + .add(NSE_Blocks.GLAZED_BRICK_TILES) + .add(NSE_Blocks.CRACKED_GLAZED_BRICK_TILES) + .add(NSE_Blocks.RED_BRICKS) + .add(NSE_Blocks.CRACKED_RED_BRICKS) + .add(NSE_Blocks.MOSSY_RED_BRICKS) + //teal .add(NSE_Blocks.TEAL_TILES) .add(NSE_Blocks.CRACKED_TEAL_TILES) .add(NSE_Blocks.MOSSY_TEAL_TILES) @@ -231,6 +295,12 @@ public class DataGeneration implements DataGeneratorEntrypoint { .add(NSE_Blocks.CRACKED_CALCITE_TILES) .add(NSE_Blocks.MOSSY_CALCITE_TILES) .add(NSE_Blocks.DIAGONAL_CALCITE_TILES) + //nii walls + .add(NSE_Blocks.NII_WALL_1) + .add(NSE_Blocks.CRACKED_NII_WALL_1) + .add(NSE_Blocks.NII_WALL_2) + .add(NSE_Blocks.NII_WALL_3) + //dripstone .add(NSE_Blocks.DRIPSTONE_TILES) .add(NSE_Blocks.CRACKED_DRIPSTONE_TILES) .add(NSE_Blocks.MOSSY_DRIPSTONE_TILES) @@ -243,6 +313,7 @@ public class DataGeneration implements DataGeneratorEntrypoint { .add(NSE_Blocks.DIAGONAL_DEEPSLATE_TILES) .add(NSE_Blocks.LIGHT_BLUE_TILES) .add(NSE_Blocks.CRACKED_LIGHT_BLUE_TILES) + .add(NSE_Blocks.VARIATED_LIGHT_BLUE_TILES) .add(NSE_Blocks.MOSSY_LIGHT_BLUE_TILES) .add(NSE_Blocks.SMALL_LIGHT_BLUE_TILES) .add(NSE_Blocks.SMALL_CRACKED_LIGHT_BLUE_TILES) @@ -277,7 +348,9 @@ public class DataGeneration implements DataGeneratorEntrypoint { .add(NSE_Blocks.PURPLE_WARNING) .add(NSE_Blocks.MAGENTA_WARNING) .add(NSE_Blocks.METAL_PLATING) - .add(NSE_Blocks.CONCRETE_WALL); + .add(NSE_Blocks.CONCRETE_WALL) + .add(NSE_Blocks.SMALL_YELLOW_TILES) + .add(NSE_Blocks.SMALL_CRACKED_YELLOW_TILES); // Blocks mined with an axe getOrCreateTagBuilder(BlockTags.AXE_MINEABLE) @@ -310,10 +383,21 @@ public class DataGeneration implements DataGeneratorEntrypoint { .add(NSE_Blocks.BROWN_LINOLEUM) .add(NSE_Blocks.CYAN_LINOLEUM) .add(NSE_Blocks.CROSS_ORANGE_LINOLEUM) - .add(NSE_Blocks.CROSS_BROWN_LINOLEUM); + .add(NSE_Blocks.CROSS_BROWN_LINOLEUM) + .add(NSE_Blocks.CHISELED_BIRCH_DOOR) + .add(NSE_Blocks.CHISELED_MANGROVE_DOOR) + .add(NSE_Blocks.CHISELED_OAK_DOOR) + .add(NSE_Blocks.CHISELED_SPRUCE_DOOR) + .add(NSE_Blocks.GREEN_WALLPAPER) + .add(NSE_Blocks.BROWN_WALLPAPER) + .add(NSE_Blocks.BEIGE_WALLPAPER) + ; - getOrCreateTagBuilder(BlockTags.SHOVEL_MINEABLE) - .add(NSE_Custom.LANDMINE); + getOrCreateTagBuilder(NSE_Tags.Blocks.RAKE_MINEABLE) + .add(NSE_Blocks.MEAT) + .add(NSE_Blocks.MEAT_EYE) + .add(NSE_Blocks.MEAT_TEETH) + .add(NSE_Blocks.PURPLE_GOO); } } @@ -472,6 +556,23 @@ public class DataGeneration implements DataGeneratorEntrypoint { .offerTo(exporter); } + private void rakeRecipe(Consumer exporter, ItemConvertible output) { + ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, output, 1) + .pattern("III") + .pattern(" N ") + .pattern(" S ") + .input('S', Items.STICK) + .input('I', Items.IRON_INGOT) + .input('N', Items.IRON_NUGGET) + .criterion(RecipeProvider.hasItem(Items.STICK), + RecipeProvider.conditionsFromItem(Items.STICK)) + .criterion(RecipeProvider.hasItem(Items.IRON_INGOT), + RecipeProvider.conditionsFromItem(Items.IRON_INGOT)) + .criterion(RecipeProvider.hasItem(Items.IRON_NUGGET), + RecipeProvider.conditionsFromItem(Items.IRON_NUGGET)) + .offerTo(exporter); + } + @Override public void generate(Consumer exporter) { crissCrossRecipe(exporter, NSE_Blocks.SAND_TILES, Blocks.SMOOTH_SANDSTONE, Blocks.SMOOTH_RED_SANDSTONE); @@ -486,8 +587,14 @@ public class DataGeneration implements DataGeneratorEntrypoint { ceilingFanRecipe(exporter, NSE_Custom.CEILING_FAN); lampRecipe(exporter, NSE_Custom.LAMP); sickleRecipe(exporter, NSE_Items.SICKLE); + rakeRecipe(exporter, NSE_Items.RAKE); // Cracked blocks + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_BRICK_TILES, NSE_Blocks.BRICK_TILES); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_GLAZED_BRICK_TILES, NSE_Blocks.GLAZED_BRICK_TILES); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_DARK_BRICK_TILES, NSE_Blocks.DARK_BRICK_TILES); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_NII_WALL_1, NSE_Blocks.NII_WALL_1); + offerCrackingRecipe(exporter, NSE_Blocks.SMALL_CRACKED_YELLOW_TILES, NSE_Blocks.SMALL_YELLOW_TILES); offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_SAND_TILES, NSE_Blocks.SAND_TILES); offerCrackingRecipe(exporter, NSE_Blocks.SMALL_CRACKED_SAND_TILES, NSE_Blocks.SMALL_SAND_TILES); offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_SAND_BRICKS, NSE_Blocks.SAND_BRICKS); @@ -519,7 +626,11 @@ public class DataGeneration implements DataGeneratorEntrypoint { offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_RED_CONCRETE, NSE_Blocks.RED_CONCRETE); offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_YELLOW_CONCRETE, NSE_Blocks.YELLOW_CONCRETE); offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_GREEN_CONCRETE, NSE_Blocks.GREEN_CONCRETE); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_GREEN_BRICKS, NSE_Blocks.GREEN_BRICKS); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_GREEN_BRICKS_2, NSE_Blocks.GREEN_BRICKS_2); + offerCrackingRecipe(exporter, NSE_Blocks.BIG_GREEN_TILES_CRACKED, NSE_Blocks.BIG_GREEN_TILES); + //Mos.Ru-ciepe mossRecipe(exporter, NSE_Blocks.MOSSY_SAND_TILES, NSE_Blocks.SAND_TILES); mossRecipe(exporter, NSE_Blocks.MOSSY_SAND_BRICKS, NSE_Blocks.SAND_BRICKS); mossRecipe(exporter, NSE_Blocks.MOSSY_TEAL_TILES, NSE_Blocks.TEAL_TILES); @@ -533,6 +644,12 @@ public class DataGeneration implements DataGeneratorEntrypoint { mossRecipe(exporter, NSE_Blocks.MOSSY_GREEN_WHITE_TILES, NSE_Blocks.GREEN_WHITE_TILES); mossRecipe(exporter, NSE_Blocks.MOSSY_TUFF_TILES, NSE_Blocks.TUFF_TILES); mossRecipe(exporter, NSE_Blocks.MOSSY_TUFF_BRICKS, NSE_Blocks.TUFF_BRICKS); + mossRecipe(exporter, NSE_Blocks.MOSSY_GREEN_BRICKS, NSE_Blocks.GREEN_BRICKS); + mossRecipe(exporter, NSE_Blocks.MOSSY_GREEN_BRICKS_2, NSE_Blocks.GREEN_BRICKS_2); + mossRecipe(exporter, NSE_Blocks.MOSSY_RED_BRICKS, NSE_Blocks.RED_BRICKS); + mossRecipe(exporter, NSE_Blocks.MOSSY_BRICK_TILES, NSE_Blocks.BRICK_TILES); + mossRecipe(exporter, NSE_Blocks.MOSSY_DARK_BRICK_TILES, NSE_Blocks.DARK_BRICK_TILES); + warningStripeRecipe(exporter, NSE_Blocks.INDUSTRIAL_WARNING, Items.BLACK_DYE); warningStripeRecipe(exporter, NSE_Blocks.RED_WARNING, Items.RED_DYE); @@ -575,6 +692,7 @@ public class DataGeneration implements DataGeneratorEntrypoint { list.add(NSE_Blocks.DIORITE_BRICKS); list.add(NSE_Blocks.BIG_DIORITE_TILES); list.add(NSE_Blocks.SMALL_DIORITE_TILES); + list.add(NSE_Blocks.NII_WALL_1); list.add(Blocks.POLISHED_DIORITE); }), RecipeCategory.BUILDING_BLOCKS); @@ -600,6 +718,7 @@ public class DataGeneration implements DataGeneratorEntrypoint { stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { list.add(NSE_Blocks.LIGHT_BLUE_TILES); list.add(NSE_Blocks.LIGHT_BLUE_BRICKS); + list.add(NSE_Blocks.VARIATED_LIGHT_BLUE_TILES); list.add(NSE_Blocks.GLAZED_LIGHT_BLUE_TILES); list.add(NSE_Blocks.SMALL_LIGHT_BLUE_TILES); }), RecipeCategory.BUILDING_BLOCKS); @@ -665,6 +784,23 @@ public class DataGeneration implements DataGeneratorEntrypoint { list.add(Blocks.SPRUCE_PLANKS); }), RecipeCategory.BUILDING_BLOCKS); + stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { + list.add(NSE_Blocks.BRICK_TILES); + list.add(NSE_Blocks.GLAZED_BRICK_TILES); + list.add(Blocks.BRICKS); + }), RecipeCategory.BUILDING_BLOCKS); + + stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { + list.add(NSE_Blocks.NII_WALL_3); + list.add(Blocks.STONE); + list.add(Blocks.STONE_BRICKS); + }), RecipeCategory.BUILDING_BLOCKS); + + stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { + list.add(NSE_Blocks.NII_WALL_2); + list.add(Blocks.SMOOTH_STONE); + }), RecipeCategory.BUILDING_BLOCKS); + diceRecipe(exporter, NSE_Items.DICE_D4); diceRecipe(exporter, NSE_Items.DICE_D6); diceRecipe(exporter, NSE_Items.DICE_D20); @@ -681,6 +817,66 @@ public class DataGeneration implements DataGeneratorEntrypoint { .input('X', Items.IRON_INGOT).input('Y', Items.IRON_NUGGET).input('Z', NSE_Items.LIGHT_BULB) .pattern(" X ").pattern(" Y ").pattern(" Z ") .criterion(hasItem(NSE_Items.LIGHT_BULB), conditionsFromItem(NSE_Items.LIGHT_BULB)).offerTo(exporter); + + ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.NII_FLOOR, 4) + .input('#', Items.DIORITE).input('G', Items.GRANITE).input('C', Items.COBBLESTONE) + .pattern("#G").pattern("GC") + .criterion(hasItem(Items.GRANITE), conditionsFromItem(Items.GRANITE)) + .criterion(hasItem(Items.DIORITE), conditionsFromItem(Items.DIORITE)) + .criterion(hasItem(Items.COBBLESTONE), conditionsFromItem(Items.COBBLESTONE)) + .offerTo(exporter); + + ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.BIG_GREEN_TILES, 8) + .input('#', NSE_Blocks.BIG_DIORITE_TILES).input('G', Items.GREEN_DYE) + .pattern("###") + .pattern("#G#") + .pattern("###") + .criterion(hasItem(Items.GREEN_DYE), conditionsFromItem(Items.GREEN_DYE)) + .criterion(hasItem(NSE_Blocks.BIG_DIORITE_TILES), conditionsFromItem(NSE_Blocks.BIG_DIORITE_TILES)) + .offerTo(exporter); + + ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.GREEN_BRICKS, 8) + .input('#', Items.BRICKS).input('G', Items.GREEN_DYE) + .pattern("###") + .pattern("#G#") + .pattern("###") + .criterion(hasItem(Items.GREEN_DYE), conditionsFromItem(Items.GREEN_DYE)) + .criterion(hasItem(Items.BRICKS), conditionsFromItem(Items.BRICKS)) + .offerTo(exporter); + + ShapelessRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.GREEN_BRICKS_2, 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); + + ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.SMALL_YELLOW_TILES, 8) + .pattern("###") + .pattern("#Y#") + .pattern("###") + .input('#', NSE_Blocks.SMALL_WHITE_TILES).input('Y', Items.YELLOW_DYE) + .criterion(hasItem(NSE_Blocks.SMALL_WHITE_TILES), conditionsFromItem(NSE_Blocks.SMALL_WHITE_TILES)) + .criterion(hasItem(Items.YELLOW_DYE), conditionsFromItem(Items.YELLOW_DYE)) + .offerTo(exporter); + + ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.RED_BRICKS, 8) + .pattern("###") + .pattern("#R#") + .pattern("###") + .input('#', Items.BRICKS).input('R', Items.RED_DYE) + .criterion(hasItem(Items.BRICKS), conditionsFromItem(Items.BRICKS)) + .criterion(hasItem(Items.RED_DYE), conditionsFromItem(Items.RED_DYE)) + .offerTo(exporter); + + ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.DARK_BRICK_TILES, 8) + .pattern("###") + .pattern("#D#") + .pattern("###") + .input('#', NSE_Blocks.BRICK_TILES).input('D', Items.BROWN_DYE) + .criterion(hasItem(NSE_Blocks.BRICK_TILES), conditionsFromItem(NSE_Blocks.BRICK_TILES)) + .criterion(hasItem(Items.BROWN_DYE), conditionsFromItem(Items.BROWN_DYE)) + .offerTo(exporter); + } } diff --git a/src/main/resources/assets/new_soviet/models/block/crate.json b/src/main/resources/assets/new_soviet/models/block/crate.json index e29e660..d78b9d6 100644 --- a/src/main/resources/assets/new_soviet/models/block/crate.json +++ b/src/main/resources/assets/new_soviet/models/block/crate.json @@ -1,34 +1,500 @@ { "credit": "Made with Blockbench", - "texture_size": [64, 64], "textures": { - "0": "new_soviet:block/industrial/crate", - "particle": "new_soviet:block/industrial/crate" + "1": "new_soviet:block/industrial/crate_1", + "2": "new_soviet:block/industrial/crate_2", + "particle": "new_soviet:block/industrial/crate_1" }, "elements": [ { - "from": [0, 0, 0], - "to": [16, 16, 16], + "from": [1, 0, 1], + "to": [15, 1, 15], "faces": { - "north": {"uv": [0, 0, 4, 4], "texture": "#0"}, - "east": {"uv": [0, 4, 4, 8], "texture": "#0"}, - "south": {"uv": [4, 0, 8, 4], "texture": "#0"}, - "west": {"uv": [4, 4, 8, 8], "texture": "#0"}, - "up": {"uv": [4, 12, 0, 8], "texture": "#0"}, - "down": {"uv": [12, 0, 8, 4], "texture": "#0"} + "north": {"uv": [1, 14, 15, 15], "texture": "#1"}, + "east": {"uv": [1, 14, 15, 15], "texture": "#1"}, + "south": {"uv": [1, 14, 15, 15], "texture": "#1"}, + "west": {"uv": [1, 14, 15, 15], "texture": "#1"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#1"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#1"} } }, { - "from": [0.5, 0.5, 0.5], - "to": [15.5, 15.5, 15.5], + "from": [0, 1, 0], + "to": [3, 15, 3], "faces": { - "north": {"uv": [4, 8, 7.75, 11.75], "texture": "#0"}, - "east": {"uv": [8, 4, 11.75, 7.75], "texture": "#0"}, - "south": {"uv": [7.75, 8, 11.5, 11.75], "texture": "#0"}, - "west": {"uv": [11.5, 7.75, 15.25, 11.5], "texture": "#0"}, - "up": {"uv": [15.25, 15.25, 11.5, 11.5], "texture": "#0"}, - "down": {"uv": [7.75, 11.75, 4, 15.5], "texture": "#0"} + "north": {"uv": [13, 1, 16, 15], "texture": "#2"}, + "east": {"uv": [16, 1, 13, 15], "texture": "#2"}, + "south": {"uv": [16, 1, 13, 15], "texture": "#2"}, + "west": {"uv": [13, 1, 16, 15], "texture": "#2"}, + "up": {"uv": [13, 0, 16, 3], "texture": "#2"}, + "down": {"uv": [13, 13, 16, 16], "texture": "#2"} + } + }, + { + "from": [13, 1, 0], + "to": [16, 15, 3], + "faces": { + "north": {"uv": [13, 1, 16, 15], "texture": "#2"}, + "east": {"uv": [13, 1, 16, 15], "texture": "#2"}, + "south": {"uv": [16, 1, 13, 15], "texture": "#2"}, + "west": {"uv": [16, 1, 13, 15], "texture": "#2"}, + "up": {"uv": [13, 0, 16, 3], "texture": "#2"}, + "down": {"uv": [13, 13, 16, 16], "texture": "#2"} + } + }, + { + "from": [3, 13, 0], + "to": [13, 15, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [3, 1, 13, 3], "texture": "#2"}, + "east": {"uv": [10, 1, 13, 3], "texture": "#2"}, + "south": {"uv": [3, 1, 13, 3], "texture": "#2"}, + "west": {"uv": [3, 1, 6, 3], "texture": "#2"}, + "up": {"uv": [3, 0, 13, 3], "texture": "#2"}, + "down": {"uv": [3, 0, 13, 3], "texture": "#2"} + } + }, + { + "from": [3, 1, 0], + "to": [13, 2, 3], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [3, 14, 13, 15], "texture": "#2"}, + "east": {"uv": [10, 1, 13, 3], "texture": "#2"}, + "south": {"uv": [3, 14, 13, 15], "texture": "#2"}, + "west": {"uv": [3, 1, 6, 3], "texture": "#2"}, + "up": {"uv": [3, 0, 13, 3], "texture": "#2"}, + "down": {"uv": [3, 0, 13, 3], "texture": "#2"} + } + }, + { + "from": [13, 1, 3], + "to": [16, 2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [3, 1, 6, 3], "texture": "#2"}, + "east": {"uv": [3, 14, 13, 15], "texture": "#2"}, + "south": {"uv": [10, 1, 13, 3], "texture": "#2"}, + "west": {"uv": [3, 14, 13, 15], "texture": "#2"}, + "up": {"uv": [3, 0, 13, 3], "rotation": 90, "texture": "#2"}, + "down": {"uv": [3, 0, 13, 3], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [3, 1, 13], + "to": [13, 2, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [3, 14, 13, 15], "texture": "#2"}, + "east": {"uv": [3, 1, 6, 3], "texture": "#2"}, + "south": {"uv": [3, 14, 13, 15], "texture": "#2"}, + "west": {"uv": [10, 1, 13, 3], "texture": "#2"}, + "up": {"uv": [3, 0, 13, 3], "rotation": 180, "texture": "#2"}, + "down": {"uv": [3, 0, 13, 3], "rotation": 180, "texture": "#2"} + } + }, + { + "from": [0, 1, 3], + "to": [3, 2, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [10, 1, 13, 3], "texture": "#2"}, + "east": {"uv": [3, 14, 13, 15], "texture": "#2"}, + "south": {"uv": [3, 1, 6, 3], "texture": "#2"}, + "west": {"uv": [3, 14, 13, 15], "texture": "#2"}, + "up": {"uv": [3, 0, 13, 3], "rotation": 270, "texture": "#2"}, + "down": {"uv": [3, 0, 13, 3], "rotation": 90, "texture": "#2"} + } + }, + { + "from": [13, 13, 3], + "to": [16, 15, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [3, 1, 6, 3], "texture": "#2"}, + "east": {"uv": [3, 1, 13, 3], "texture": "#2"}, + "south": {"uv": [10, 1, 13, 3], "texture": "#2"}, + "west": {"uv": [3, 1, 13, 3], "texture": "#2"}, + "up": {"uv": [3, 0, 13, 3], "rotation": 90, "texture": "#2"}, + "down": {"uv": [3, 0, 13, 3], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [3, 13, 13], + "to": [13, 15, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [3, 1, 13, 3], "texture": "#2"}, + "east": {"uv": [3, 1, 6, 3], "texture": "#2"}, + "south": {"uv": [3, 1, 13, 3], "texture": "#2"}, + "west": {"uv": [10, 1, 13, 3], "texture": "#2"}, + "up": {"uv": [3, 0, 13, 3], "rotation": 180, "texture": "#2"}, + "down": {"uv": [3, 0, 13, 3], "rotation": 180, "texture": "#2"} + } + }, + { + "from": [0, 13, 3], + "to": [3, 15, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [10, 1, 13, 3], "texture": "#2"}, + "east": {"uv": [3, 1, 13, 3], "texture": "#2"}, + "south": {"uv": [3, 1, 6, 3], "texture": "#2"}, + "west": {"uv": [3, 1, 13, 3], "texture": "#2"}, + "up": {"uv": [3, 0, 13, 3], "rotation": 270, "texture": "#2"}, + "down": {"uv": [3, 0, 13, 3], "rotation": 90, "texture": "#2"} + } + }, + { + "from": [15, 2, 3], + "to": [15, 13, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [3, 3, 13, 14], "texture": "#2"}, + "east": {"uv": [3, 3, 13, 14], "texture": "#2"}, + "south": {"uv": [3, 3, 13, 14], "texture": "#2"}, + "west": {"uv": [3, 3, 13, 14], "texture": "#2"}, + "up": {"uv": [3, 3, 13, 14], "rotation": 90, "texture": "#2"}, + "down": {"uv": [3, 3, 13, 14], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [3, 2, 15], + "to": [13, 13, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [3, 3, 13, 14], "texture": "#2"}, + "east": {"uv": [3, 3, 13, 14], "texture": "#2"}, + "south": {"uv": [3, 3, 13, 14], "texture": "#2"}, + "west": {"uv": [3, 3, 13, 14], "texture": "#2"}, + "up": {"uv": [3, 3, 13, 14], "rotation": 180, "texture": "#2"}, + "down": {"uv": [3, 3, 13, 14], "rotation": 180, "texture": "#2"} + } + }, + { + "from": [1, 2, 3], + "to": [1, 13, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [3, 3, 13, 14], "texture": "#2"}, + "east": {"uv": [3, 3, 13, 14], "texture": "#2"}, + "south": {"uv": [3, 3, 13, 14], "texture": "#2"}, + "west": {"uv": [3, 3, 13, 14], "texture": "#2"}, + "up": {"uv": [3, 3, 13, 14], "rotation": 270, "texture": "#2"}, + "down": {"uv": [3, 3, 13, 14], "rotation": 90, "texture": "#2"} + } + }, + { + "from": [3, 2, 1], + "to": [13, 13, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [3, 3, 13, 14], "texture": "#2"}, + "east": {"uv": [3, 3, 13, 14], "texture": "#2"}, + "south": {"uv": [3, 3, 13, 14], "texture": "#2"}, + "west": {"uv": [3, 3, 13, 14], "texture": "#2"}, + "up": {"uv": [3, 3, 13, 14], "texture": "#2"}, + "down": {"uv": [3, 3, 13, 14], "texture": "#2"} + } + }, + { + "from": [0, 9, 3], + "to": [1, 11, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [3, 5, 4, 7], "texture": "#2"}, + "east": {"uv": [3, 5, 13, 7], "texture": "#2"}, + "south": {"uv": [12, 5, 13, 7], "texture": "#2"}, + "west": {"uv": [3, 5, 13, 7], "texture": "#2"}, + "up": {"uv": [3, 5, 13, 6], "rotation": 270, "texture": "#2"}, + "down": {"uv": [3, 6, 13, 7], "rotation": 90, "texture": "#2"} + } + }, + { + "from": [0, 4, 3], + "to": [1, 6, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [3, 10, 4, 12], "texture": "#2"}, + "east": {"uv": [3, 10, 13, 12], "texture": "#2"}, + "south": {"uv": [12, 10, 13, 12], "texture": "#2"}, + "west": {"uv": [3, 10, 13, 12], "texture": "#2"}, + "up": {"uv": [3, 10, 13, 11], "rotation": 270, "texture": "#2"}, + "down": {"uv": [3, 11, 13, 12], "rotation": 90, "texture": "#2"} + } + }, + { + "from": [3, 4, 0], + "to": [13, 6, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [3, 10, 13, 12], "texture": "#2"}, + "east": {"uv": [3, 10, 4, 12], "texture": "#2"}, + "south": {"uv": [3, 10, 13, 12], "texture": "#2"}, + "west": {"uv": [12, 10, 13, 12], "texture": "#2"}, + "up": {"uv": [3, 10, 13, 11], "texture": "#2"}, + "down": {"uv": [3, 11, 13, 12], "texture": "#2"} + } + }, + { + "from": [3, 9, 0], + "to": [13, 11, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [3, 5, 13, 7], "texture": "#2"}, + "east": {"uv": [3, 5, 4, 7], "texture": "#2"}, + "south": {"uv": [3, 5, 13, 7], "texture": "#2"}, + "west": {"uv": [12, 5, 13, 7], "texture": "#2"}, + "up": {"uv": [3, 5, 13, 6], "texture": "#2"}, + "down": {"uv": [3, 6, 13, 7], "texture": "#2"} + } + }, + { + "from": [15, 4, 3], + "to": [16, 6, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [12, 10, 13, 12], "texture": "#2"}, + "east": {"uv": [3, 10, 13, 12], "texture": "#2"}, + "south": {"uv": [3, 10, 4, 12], "texture": "#2"}, + "west": {"uv": [3, 10, 13, 12], "texture": "#2"}, + "up": {"uv": [3, 10, 13, 11], "rotation": 90, "texture": "#2"}, + "down": {"uv": [3, 11, 13, 12], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [15, 9, 3], + "to": [16, 11, 13], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [12, 5, 13, 7], "texture": "#2"}, + "east": {"uv": [3, 5, 13, 7], "texture": "#2"}, + "south": {"uv": [3, 5, 4, 7], "texture": "#2"}, + "west": {"uv": [3, 5, 13, 7], "texture": "#2"}, + "up": {"uv": [3, 5, 13, 6], "rotation": 90, "texture": "#2"}, + "down": {"uv": [3, 6, 13, 7], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [3, 4, 15], + "to": [13, 6, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [3, 10, 13, 12], "texture": "#2"}, + "east": {"uv": [12, 10, 13, 12], "texture": "#2"}, + "south": {"uv": [3, 10, 13, 12], "texture": "#2"}, + "west": {"uv": [3, 10, 4, 12], "texture": "#2"}, + "up": {"uv": [3, 10, 13, 11], "rotation": 180, "texture": "#2"}, + "down": {"uv": [3, 11, 13, 12], "rotation": 180, "texture": "#2"} + } + }, + { + "from": [3, 9, 15], + "to": [13, 11, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [3, 5, 13, 7], "texture": "#2"}, + "east": {"uv": [12, 5, 13, 7], "texture": "#2"}, + "south": {"uv": [3, 5, 13, 7], "texture": "#2"}, + "west": {"uv": [3, 5, 4, 7], "texture": "#2"}, + "up": {"uv": [3, 5, 13, 6], "rotation": 180, "texture": "#2"}, + "down": {"uv": [3, 6, 13, 7], "rotation": 180, "texture": "#2"} + } + }, + { + "from": [13, 1, 13], + "to": [16, 15, 16], + "faces": { + "north": {"uv": [16, 1, 13, 15], "texture": "#2"}, + "east": {"uv": [13, 1, 16, 15], "texture": "#2"}, + "south": {"uv": [13, 1, 16, 15], "texture": "#2"}, + "west": {"uv": [16, 1, 13, 15], "texture": "#2"}, + "up": {"uv": [13, 0, 16, 3], "texture": "#2"}, + "down": {"uv": [13, 13, 16, 16], "texture": "#2"} + } + }, + { + "from": [0, 1, 13], + "to": [3, 15, 16], + "faces": { + "north": {"uv": [16, 1, 13, 15], "texture": "#2"}, + "east": {"uv": [16, 1, 13, 15], "texture": "#2"}, + "south": {"uv": [13, 1, 16, 15], "texture": "#2"}, + "west": {"uv": [13, 1, 16, 15], "texture": "#2"}, + "up": {"uv": [13, 0, 16, 3], "texture": "#2"}, + "down": {"uv": [13, 13, 16, 16], "texture": "#2"} + } + }, + { + "from": [1, 15, 1], + "to": [15, 16, 15], + "faces": { + "north": {"uv": [1, 14, 15, 15], "texture": "#1"}, + "east": {"uv": [1, 14, 15, 15], "texture": "#1"}, + "south": {"uv": [1, 14, 15, 15], "texture": "#1"}, + "west": {"uv": [1, 14, 15, 15], "texture": "#1"}, + "up": {"uv": [1, 1, 15, 15], "texture": "#1"}, + "down": {"uv": [1, 1, 15, 15], "texture": "#1"} + } + }, + { + "from": [0, 16.01, 0], + "to": [16, 16.01, 16], + "faces": { + "north": {"uv": [0, 0, 15, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 15, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 15, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 15, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 15, 16], "texture": "#1"}, + "down": {"uv": [0, 0, 15, 16], "texture": "#1"} + } + }, + { + "from": [0, -0.01, 0], + "to": [16, -0.01, 16], + "faces": { + "north": {"uv": [0, 0, 15, 16], "texture": "#1"}, + "east": {"uv": [0, 0, 15, 16], "texture": "#1"}, + "south": {"uv": [0, 0, 15, 16], "texture": "#1"}, + "west": {"uv": [0, 0, 15, 16], "texture": "#1"}, + "up": {"uv": [0, 0, 15, 16], "texture": "#1"}, + "down": {"uv": [0, 0, 15, 16], "texture": "#1"} + } + }, + { + "from": [0, 15, 0], + "to": [15, 16, 1], + "faces": { + "north": {"uv": [1, 0, 16, 1], "texture": "#2"}, + "east": {"uv": [15, 0, 16, 1], "texture": "#2"}, + "south": {"uv": [1, 0, 16, 1], "texture": "#2"}, + "west": {"uv": [0, 0, 1, 1], "texture": "#2"}, + "up": {"uv": [1, 15, 16, 16], "texture": "#1"}, + "down": {"uv": [1, 0, 16, 1], "texture": "#2"} + } + }, + { + "from": [0, 0, 0], + "to": [15, 1, 1], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [1, 15, 16, 16], "texture": "#2"}, + "east": {"uv": [15, 15, 16, 16], "texture": "#2"}, + "south": {"uv": [1, 15, 16, 16], "texture": "#2"}, + "west": {"uv": [0, 15, 1, 16], "texture": "#2"}, + "up": {"uv": [1, 15, 16, 16], "texture": "#1"}, + "down": {"uv": [1, 15, 16, 16], "texture": "#2"} + } + }, + { + "from": [0, 0, 1], + "to": [1, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [15, 15, 16, 16], "texture": "#2"}, + "east": {"uv": [1, 15, 16, 16], "texture": "#2"}, + "south": {"uv": [0, 15, 1, 16], "texture": "#2"}, + "west": {"uv": [1, 15, 16, 16], "texture": "#2"}, + "up": {"uv": [1, 15, 16, 16], "rotation": 270, "texture": "#1"}, + "down": {"uv": [1, 15, 16, 16], "rotation": 90, "texture": "#2"} + } + }, + { + "from": [1, 0, 15], + "to": [16, 1, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [1, 15, 16, 16], "texture": "#2"}, + "east": {"uv": [0, 15, 1, 16], "texture": "#2"}, + "south": {"uv": [1, 15, 16, 16], "texture": "#2"}, + "west": {"uv": [15, 15, 16, 16], "texture": "#2"}, + "up": {"uv": [1, 15, 16, 16], "rotation": 180, "texture": "#1"}, + "down": {"uv": [1, 15, 16, 16], "rotation": 180, "texture": "#2"} + } + }, + { + "from": [15, 0, 0], + "to": [16, 1, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 15, 1, 16], "texture": "#2"}, + "east": {"uv": [1, 15, 16, 16], "texture": "#2"}, + "south": {"uv": [15, 15, 16, 16], "texture": "#2"}, + "west": {"uv": [1, 15, 16, 16], "texture": "#2"}, + "up": {"uv": [1, 15, 16, 16], "rotation": 90, "texture": "#1"}, + "down": {"uv": [1, 15, 16, 16], "rotation": 270, "texture": "#2"} + } + }, + { + "from": [0, 15, 1], + "to": [1, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [15, 0, 16, 1], "texture": "#2"}, + "east": {"uv": [1, 0, 16, 1], "texture": "#2"}, + "south": {"uv": [0, 0, 1, 1], "texture": "#2"}, + "west": {"uv": [1, 0, 16, 1], "texture": "#2"}, + "up": {"uv": [15, 0, 16, 15], "rotation": 180, "texture": "#1"}, + "down": {"uv": [1, 0, 16, 1], "rotation": 90, "texture": "#2"} + } + }, + { + "from": [1, 15, 15], + "to": [16, 16, 16], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [1, 0, 16, 1], "texture": "#2"}, + "east": {"uv": [0, 0, 1, 1], "texture": "#2"}, + "south": {"uv": [1, 0, 16, 1], "texture": "#2"}, + "west": {"uv": [15, 0, 16, 1], "texture": "#2"}, + "up": {"uv": [0, 0, 15, 1], "rotation": 180, "texture": "#1"}, + "down": {"uv": [1, 0, 16, 1], "rotation": 180, "texture": "#2"} + } + }, + { + "from": [15, 15, 0], + "to": [16, 16, 15], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [0, 0, 1, 1], "texture": "#2"}, + "east": {"uv": [1, 0, 16, 1], "texture": "#2"}, + "south": {"uv": [15, 0, 16, 1], "texture": "#2"}, + "west": {"uv": [1, 0, 16, 1], "texture": "#2"}, + "up": {"uv": [0, 1, 1, 16], "rotation": 180, "texture": "#1"}, + "down": {"uv": [1, 0, 16, 1], "rotation": 270, "texture": "#2"} } } - ] + ], + "display": { + "thirdperson_righthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "thirdperson_lefthand": { + "rotation": [75, 45, 0], + "translation": [0, 2.5, 0], + "scale": [0.375, 0.375, 0.375] + }, + "firstperson_righthand": { + "rotation": [0, 45, 0], + "scale": [0.4, 0.4, 0.4] + }, + "firstperson_lefthand": { + "rotation": [0, 225, 0], + "scale": [0.4, 0.4, 0.4] + }, + "ground": { + "translation": [0, 3, 0], + "scale": [0.25, 0.25, 0.25] + }, + "gui": { + "rotation": [30, 225, 0], + "scale": [0.625, 0.625, 0.625] + }, + "fixed": { + "scale": [0.5, 0.5, 0.5] + } + } } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/textures/block/red/cracked_glazed_red_tiles.png b/src/main/resources/assets/new_soviet/textures/block/red/cracked_glazed_red_tiles.png index 949b95e389079f837dd05dfab13d2b3916d22941..5f448b821e3aae5ab34a7490b033b7adfe89487c 100644 GIT binary patch delta 437 zcmV;m0ZRUf1c3yQR)3aBL_t(IPi;~?Ps1=2e9uW5(-c8j5k*3%U8xwESl}NZ5I>fQ zAJCZri2@6#0n&!pNo>wBYC^>gPtN6i+&i1EPR51OL{wDuP9iTSBeMA7`^VR_qkSTS z^WDSq`FNjdOF{^riYUWC5aW;*YW|t!WrghYTg_hHjCDOyrGICy@2A&7NH>k`QkRQdMS)1ai!?9L!WBS_kLWq<#{(HH zayP*hJB_?N(=Lf%_9}4|aTKVk!dh_8tw$6H fcQzKU+Yr$Y=QJCpu#o-F00000NkvXXu0mjfzQNe? delta 445 zcmV;u0Yd(P1c?NYR)3yJL_t(IPhC>WO2jY}y-C|?oKbNGTqp{MrE%07Qi3V)55B#Dr%ZS5b4`%8*g zbUW#wmp2VaIO6x2o|e84aYzk-KooObeCaHa?{hOPD-w*VgPtOXSEiR`ZLWtT=4n;+ zm118T7m}I|bG@vxem4i*F5pi&LrEq~JTWEW%~n;Xs-3YGOd@4z>r_fdPLfQd(AGABC=4ooG8YX~*MUMF!WcU|Rlq1Ir00000NkvXXu0mjfaU{-6 diff --git a/src/main/resources/assets/new_soviet/textures/block/research_institute/cracked_nii_wall_1.png b/src/main/resources/assets/new_soviet/textures/block/research_institute/cracked_nii_wall_1.png index 99c496d6030dd0766fee48fab343aa8681804a9d..2e88b03a424135791fae74b72ee52ee717a68813 100644 GIT binary patch delta 476 zcmV<20VDp?2KEDxB!2;OQb$4nuFf3k00057Nkldrc{DHxT8A*9CtMeJKl*`yYXn3|eZL=XLFy&ZMVvW~W5moFqks`ZSyZC~ z-+QE9rul$WjB6x}s?&pidHMeG%fp`s0FK8yLikIe6@@N%rQUF+7L-LrINnhf6>qC| zoT8r!RuX4N3IuvvdVYn7Z#f8puAEUGkKW|rpJ2UY9M1VHiTX(y}OLV%g#T0L)+6;r>9gYG_u?44=Nx82004R=004l4008;_ z004mL004C`008P>0026e000+nl3&F}0008nNklE}Y(ibvT>g3S?y$#uPgPZ1UcSa#M_pG`Wlb1{C>;`oA+@o14;t@i zyd&S{c<;Ht&v7 zb>O@sNm|5ljC9W8y+>=wXf#49#V4PCL6i=7|MW9PM<-<2J1uBY%WKD20?7V=7EtB7pID%zIDAc;`4e8q@9e=ytjYDUnj3!!V)O8)EB<<$S?x z`hfSIC{EZN3}~8$hv}4qa0jIokqB9@S16?z_Iv2-zb_aL_h=fybUI()4!PN^nJ?z7S1Y8HNF}+SOt|>tcdWI{W)CEBL{U8Uuv#tIY&UH4ExrC8 z^5pa*(lq7v_AO;u5~u*{96}0&5C9w;9+IXBVGv@i!J3-JdDg21G6(|pM+YQHf-#1s zaW(9Z4j2yih{A~D@l&>&CB{5@I6OS2KN!*<45+Jue+K|IbaY`N5^t3N0000Px$8%ab#R49>kQo(A&FbsW5UE-2BEa|B$gd@E02q^6AB1duI3Bj*cm3de0FVIa z`T>A*V_aUC;+tHXTqlIciIc1kSeWxcEo1UzmAE}i0s~z?91q*7%qXdD+PC-fkCuU|#3nX%v961P6oO-oz> zka^clOTQ{JW>AlauF5PaaxK$X+H&0g?qS9eoA06P2YwJyA_JT>SRYOgcSJuvyYC;j z(QDo_ZPOlR-(jQI%VwB!-Gg%@kE9BXoOlm^9Lcdai6sjl00000NkvXXu0mjf8()&W