diff --git a/LICENSE b/LICENSE index a95baeb..96d7069 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,5 @@ The following directory, it's subdirectories, and any files inside said directories or subdirectories are subject to the license below. -The only exceptions are files in /src/main/resources/assets/new_soviet/sounds, see relevant LICENSE file there - /src/main/resources/ All Rights Reserved diff --git a/src/main/generated/data/minecraft/tags/blocks/mineable/axe.json b/src/main/generated/data/minecraft/tags/blocks/mineable/axe.json index e85388e..75ad38c 100644 --- a/src/main/generated/data/minecraft/tags/blocks/mineable/axe.json +++ b/src/main/generated/data/minecraft/tags/blocks/mineable/axe.json @@ -30,6 +30,13 @@ "new_soviet:brown_linoleum", "new_soviet:cyan_linoleum", "new_soviet:cross_orange_linoleum", - "new_soviet:cross_brown_linoleum" + "new_soviet:cross_brown_linoleum", + "new_soviet:chiseled_birch_door", + "new_soviet:chiseled_mangrove_door", + "new_soviet:chiseled_oak_door", + "new_soviet:chiseled_spruce_door", + "new_soviet:green_wallpaper", + "new_soviet:brown_wallpaper", + "new_soviet:beige_wallpaper" ] } \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/generated/data/minecraft/tags/blocks/mineable/pickaxe.json index 78c7dda..e9caf71 100644 --- a/src/main/generated/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/main/generated/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -2,6 +2,15 @@ "replace": false, "values": [ "new_soviet:sand_tiles", + "new_soviet:nii_floor", + "new_soviet:big_green_tiles", + "new_soviet:big_green_tiles_cracked", + "new_soviet:green_bricks", + "new_soviet:cracked_green_bricks", + "new_soviet:mossy_green_bricks", + "new_soviet:green_bricks_2", + "new_soviet:cracked_green_bricks_2", + "new_soviet:mossy_green_bricks_2", "new_soviet:cracked_sand_tiles", "new_soviet:mossy_sand_tiles", "new_soviet:small_sand_tiles", @@ -13,6 +22,19 @@ "new_soviet:cracked_sand_bricks", "new_soviet:mossy_sand_bricks", "new_soviet:big_sand_bricks", + "new_soviet:brick_tiles", + "new_soviet:cracked_brick_tiles", + "new_soviet:mossy_brick_tiles", + "new_soviet:dirty_brick_tiles", + "new_soviet:dark_brick_tiles", + "new_soviet:cracked_dark_brick_tiles", + "new_soviet:mossy_dark_brick_tiles", + "new_soviet:dirty_dark_brick_tiles", + "new_soviet:glazed_brick_tiles", + "new_soviet:cracked_glazed_brick_tiles", + "new_soviet:red_bricks", + "new_soviet:cracked_red_bricks", + "new_soviet:mossy_red_bricks", "new_soviet:teal_tiles", "new_soviet:cracked_teal_tiles", "new_soviet:mossy_teal_tiles", @@ -39,6 +61,10 @@ "new_soviet:cracked_calcite_tiles", "new_soviet:mossy_calcite_tiles", "new_soviet:diagonal_calcite_tiles", + "new_soviet:nii_wall_1", + "new_soviet:cracked_nii_wall_1", + "new_soviet:nii_wall_2", + "new_soviet:nii_wall_3", "new_soviet:dripstone_tiles", "new_soviet:cracked_dripstone_tiles", "new_soviet:mossy_dripstone_tiles", @@ -51,6 +77,7 @@ "new_soviet:diagonal_deepslate_tiles", "new_soviet:light_blue_tiles", "new_soviet:cracked_light_blue_tiles", + "new_soviet:variated_light_blue_tiles", "new_soviet:mossy_light_blue_tiles", "new_soviet:small_light_blue_tiles", "new_soviet:small_cracked_light_blue_tiles", @@ -85,6 +112,8 @@ "new_soviet:purple_warning", "new_soviet:magenta_warning", "new_soviet:metal_plating", - "new_soviet:concrete_wall" + "new_soviet:concrete_wall", + "new_soviet:small_yellow_tiles", + "new_soviet:small_cracked_yellow_tiles" ] } \ No newline at end of file diff --git a/src/main/generated/data/minecraft/tags/blocks/mineable/shovel.json b/src/main/generated/data/minecraft/tags/blocks/mineable/shovel.json deleted file mode 100644 index 102da8a..0000000 --- a/src/main/generated/data/minecraft/tags/blocks/mineable/shovel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "new_soviet:landmine" - ] -} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/beige_wallpaper.json b/src/main/generated/data/new_soviet/loot_tables/blocks/beige_wallpaper.json new file mode 100644 index 0000000..61e8837 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/beige_wallpaper.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:beige_wallpaper" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/big_green_tiles.json b/src/main/generated/data/new_soviet/loot_tables/blocks/big_green_tiles.json new file mode 100644 index 0000000..f4d88b8 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/big_green_tiles.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:big_green_tiles" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/big_green_tiles_cracked.json b/src/main/generated/data/new_soviet/loot_tables/blocks/big_green_tiles_cracked.json new file mode 100644 index 0000000..dd1b21a --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/big_green_tiles_cracked.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:big_green_tiles_cracked" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/brick_tiles.json b/src/main/generated/data/new_soviet/loot_tables/blocks/brick_tiles.json new file mode 100644 index 0000000..64af0cc --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/brick_tiles.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:brick_tiles" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/brown_wallpaper.json b/src/main/generated/data/new_soviet/loot_tables/blocks/brown_wallpaper.json new file mode 100644 index 0000000..2f7a602 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/brown_wallpaper.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:brown_wallpaper" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/chiseled_birch_door.json b/src/main/generated/data/new_soviet/loot_tables/blocks/chiseled_birch_door.json new file mode 100644 index 0000000..bd082d2 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/chiseled_birch_door.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:chiseled_birch_door" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/chiseled_mangrove_door.json b/src/main/generated/data/new_soviet/loot_tables/blocks/chiseled_mangrove_door.json new file mode 100644 index 0000000..a1b8819 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/chiseled_mangrove_door.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:chiseled_mangrove_door" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/chiseled_oak_door.json b/src/main/generated/data/new_soviet/loot_tables/blocks/chiseled_oak_door.json new file mode 100644 index 0000000..374e226 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/chiseled_oak_door.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:chiseled_oak_door" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/chiseled_spruce_door.json b/src/main/generated/data/new_soviet/loot_tables/blocks/chiseled_spruce_door.json new file mode 100644 index 0000000..f23c6cf --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/chiseled_spruce_door.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:chiseled_spruce_door" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_brick_tiles.json b/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_brick_tiles.json new file mode 100644 index 0000000..fd5ec8d --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_brick_tiles.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:cracked_brick_tiles" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_dark_brick_tiles.json b/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_dark_brick_tiles.json new file mode 100644 index 0000000..c50a976 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_dark_brick_tiles.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:cracked_dark_brick_tiles" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_green_bricks.json b/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_green_bricks.json new file mode 100644 index 0000000..4c51a2a --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_green_bricks.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:cracked_green_bricks" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_green_bricks_2.json b/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_green_bricks_2.json new file mode 100644 index 0000000..7088abe --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_green_bricks_2.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:cracked_green_bricks_2" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_nii_wall_1.json b/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_nii_wall_1.json new file mode 100644 index 0000000..a8209ce --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/cracked_nii_wall_1.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:cracked_nii_wall_1" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/dark_brick_tiles.json b/src/main/generated/data/new_soviet/loot_tables/blocks/dark_brick_tiles.json new file mode 100644 index 0000000..a21739a --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/dark_brick_tiles.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:dark_brick_tiles" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/dirty_brick_tiles.json b/src/main/generated/data/new_soviet/loot_tables/blocks/dirty_brick_tiles.json new file mode 100644 index 0000000..d06bb70 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/dirty_brick_tiles.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:dirty_brick_tiles" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/dirty_dark_brick_tiles.json b/src/main/generated/data/new_soviet/loot_tables/blocks/dirty_dark_brick_tiles.json new file mode 100644 index 0000000..4a47b8d --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/dirty_dark_brick_tiles.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:dirty_dark_brick_tiles" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/green_bricks.json b/src/main/generated/data/new_soviet/loot_tables/blocks/green_bricks.json new file mode 100644 index 0000000..ce07bb2 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/green_bricks.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:green_bricks" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/green_bricks_2.json b/src/main/generated/data/new_soviet/loot_tables/blocks/green_bricks_2.json new file mode 100644 index 0000000..1966e9f --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/green_bricks_2.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:green_bricks_2" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/green_wallpaper.json b/src/main/generated/data/new_soviet/loot_tables/blocks/green_wallpaper.json new file mode 100644 index 0000000..9935ece --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/green_wallpaper.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:green_wallpaper" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/landmine.json b/src/main/generated/data/new_soviet/loot_tables/blocks/meat.json similarity index 88% rename from src/main/generated/data/new_soviet/loot_tables/blocks/landmine.json rename to src/main/generated/data/new_soviet/loot_tables/blocks/meat.json index 2a1a08a..0db852d 100644 --- a/src/main/generated/data/new_soviet/loot_tables/blocks/landmine.json +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/meat.json @@ -11,7 +11,7 @@ "entries": [ { "type": "minecraft:item", - "name": "new_soviet:landmine" + "name": "new_soviet:meat" } ], "rolls": 1.0 diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/meat_eye.json b/src/main/generated/data/new_soviet/loot_tables/blocks/meat_eye.json new file mode 100644 index 0000000..df8139e --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/meat_eye.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:meat_eye" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/meat_teeth.json b/src/main/generated/data/new_soviet/loot_tables/blocks/meat_teeth.json new file mode 100644 index 0000000..e894020 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/meat_teeth.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:meat_teeth" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/mossy_brick_tiles.json b/src/main/generated/data/new_soviet/loot_tables/blocks/mossy_brick_tiles.json new file mode 100644 index 0000000..11d1d62 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/mossy_brick_tiles.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:mossy_brick_tiles" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/mossy_dark_brick_tiles.json b/src/main/generated/data/new_soviet/loot_tables/blocks/mossy_dark_brick_tiles.json new file mode 100644 index 0000000..e4b05dc --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/mossy_dark_brick_tiles.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:mossy_dark_brick_tiles" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/mossy_green_bricks.json b/src/main/generated/data/new_soviet/loot_tables/blocks/mossy_green_bricks.json new file mode 100644 index 0000000..b1ef5dd --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/mossy_green_bricks.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:mossy_green_bricks" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/mossy_green_bricks_2.json b/src/main/generated/data/new_soviet/loot_tables/blocks/mossy_green_bricks_2.json new file mode 100644 index 0000000..ea49ba5 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/mossy_green_bricks_2.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:mossy_green_bricks_2" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/nii_floor.json b/src/main/generated/data/new_soviet/loot_tables/blocks/nii_floor.json new file mode 100644 index 0000000..5e88cdf --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/nii_floor.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:nii_floor" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/nii_wall_1.json b/src/main/generated/data/new_soviet/loot_tables/blocks/nii_wall_1.json new file mode 100644 index 0000000..2875b7d --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/nii_wall_1.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:nii_wall_1" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/nii_wall_2.json b/src/main/generated/data/new_soviet/loot_tables/blocks/nii_wall_2.json new file mode 100644 index 0000000..51c808f --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/nii_wall_2.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:nii_wall_2" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/nii_wall_3.json b/src/main/generated/data/new_soviet/loot_tables/blocks/nii_wall_3.json new file mode 100644 index 0000000..dfada95 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/nii_wall_3.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:nii_wall_3" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/small_cracked_yellow_tiles.json b/src/main/generated/data/new_soviet/loot_tables/blocks/small_cracked_yellow_tiles.json new file mode 100644 index 0000000..535b779 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/small_cracked_yellow_tiles.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:small_cracked_yellow_tiles" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/small_yellow_tiles.json b/src/main/generated/data/new_soviet/loot_tables/blocks/small_yellow_tiles.json new file mode 100644 index 0000000..87e8efb --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/small_yellow_tiles.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:small_yellow_tiles" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/switch.json b/src/main/generated/data/new_soviet/loot_tables/blocks/switch.json new file mode 100644 index 0000000..4596980 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/switch.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:switch" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/variated_light_blue_tiles.json b/src/main/generated/data/new_soviet/loot_tables/blocks/variated_light_blue_tiles.json new file mode 100644 index 0000000..765139f --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/variated_light_blue_tiles.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "new_soviet:variated_light_blue_tiles" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/big_diorite_tiles_from_nii_wall_1_stonecutting.json b/src/main/generated/data/new_soviet/recipes/big_diorite_tiles_from_nii_wall_1_stonecutting.json new file mode 100644 index 0000000..5bd65cc --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/big_diorite_tiles_from_nii_wall_1_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:nii_wall_1" + }, + "result": "new_soviet:big_diorite_tiles" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/big_green_tiles.json b/src/main/generated/data/new_soviet/recipes/big_green_tiles.json new file mode 100644 index 0000000..29ce747 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/big_green_tiles.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "new_soviet:big_diorite_tiles" + }, + "G": { + "item": "minecraft:green_dye" + } + }, + "pattern": [ + "###", + "#G#", + "###" + ], + "result": { + "count": 8, + "item": "new_soviet:big_green_tiles" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/big_green_tiles_cracked.json b/src/main/generated/data/new_soviet/recipes/big_green_tiles_cracked.json new file mode 100644 index 0000000..8692e71 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/big_green_tiles_cracked.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:smelting", + "category": "blocks", + "cookingtime": 200, + "experience": 0.1, + "ingredient": { + "item": "new_soviet:big_green_tiles" + }, + "result": "new_soviet:big_green_tiles_cracked" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/brick_tiles_from_bricks_stonecutting.json b/src/main/generated/data/new_soviet/recipes/brick_tiles_from_bricks_stonecutting.json new file mode 100644 index 0000000..ece3fb8 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/brick_tiles_from_bricks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "minecraft:bricks" + }, + "result": "new_soviet:brick_tiles" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/brick_tiles_from_glazed_brick_tiles_stonecutting.json b/src/main/generated/data/new_soviet/recipes/brick_tiles_from_glazed_brick_tiles_stonecutting.json new file mode 100644 index 0000000..3215d48 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/brick_tiles_from_glazed_brick_tiles_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:glazed_brick_tiles" + }, + "result": "new_soviet:brick_tiles" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/bricks_from_brick_tiles_stonecutting.json b/src/main/generated/data/new_soviet/recipes/bricks_from_brick_tiles_stonecutting.json new file mode 100644 index 0000000..a1dad3f --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/bricks_from_brick_tiles_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:brick_tiles" + }, + "result": "minecraft:bricks" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/bricks_from_glazed_brick_tiles_stonecutting.json b/src/main/generated/data/new_soviet/recipes/bricks_from_glazed_brick_tiles_stonecutting.json new file mode 100644 index 0000000..bc59b6b --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/bricks_from_glazed_brick_tiles_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:glazed_brick_tiles" + }, + "result": "minecraft:bricks" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cracked_brick_tiles.json b/src/main/generated/data/new_soviet/recipes/cracked_brick_tiles.json new file mode 100644 index 0000000..571d25c --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cracked_brick_tiles.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:smelting", + "category": "blocks", + "cookingtime": 200, + "experience": 0.1, + "ingredient": { + "item": "new_soviet:brick_tiles" + }, + "result": "new_soviet:cracked_brick_tiles" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cracked_dark_brick_tiles.json b/src/main/generated/data/new_soviet/recipes/cracked_dark_brick_tiles.json new file mode 100644 index 0000000..38f587e --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cracked_dark_brick_tiles.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:smelting", + "category": "blocks", + "cookingtime": 200, + "experience": 0.1, + "ingredient": { + "item": "new_soviet:dark_brick_tiles" + }, + "result": "new_soviet:cracked_dark_brick_tiles" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cracked_glazed_brick_tiles.json b/src/main/generated/data/new_soviet/recipes/cracked_glazed_brick_tiles.json new file mode 100644 index 0000000..7e06f33 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cracked_glazed_brick_tiles.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:smelting", + "category": "blocks", + "cookingtime": 200, + "experience": 0.1, + "ingredient": { + "item": "new_soviet:glazed_brick_tiles" + }, + "result": "new_soviet:cracked_glazed_brick_tiles" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cracked_green_bricks.json b/src/main/generated/data/new_soviet/recipes/cracked_green_bricks.json new file mode 100644 index 0000000..2505fac --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cracked_green_bricks.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:smelting", + "category": "blocks", + "cookingtime": 200, + "experience": 0.1, + "ingredient": { + "item": "new_soviet:green_bricks" + }, + "result": "new_soviet:cracked_green_bricks" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cracked_green_bricks_2.json b/src/main/generated/data/new_soviet/recipes/cracked_green_bricks_2.json new file mode 100644 index 0000000..2628fa6 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cracked_green_bricks_2.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:smelting", + "category": "blocks", + "cookingtime": 200, + "experience": 0.1, + "ingredient": { + "item": "new_soviet:green_bricks_2" + }, + "result": "new_soviet:cracked_green_bricks_2" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/cracked_nii_wall_1.json b/src/main/generated/data/new_soviet/recipes/cracked_nii_wall_1.json new file mode 100644 index 0000000..35e1daa --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/cracked_nii_wall_1.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:smelting", + "category": "blocks", + "cookingtime": 200, + "experience": 0.1, + "ingredient": { + "item": "new_soviet:nii_wall_1" + }, + "result": "new_soviet:cracked_nii_wall_1" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/dark_brick_tiles.json b/src/main/generated/data/new_soviet/recipes/dark_brick_tiles.json new file mode 100644 index 0000000..f97fdb6 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/dark_brick_tiles.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "new_soviet:brick_tiles" + }, + "D": { + "item": "minecraft:brown_dye" + } + }, + "pattern": [ + "###", + "#D#", + "###" + ], + "result": { + "count": 8, + "item": "new_soviet:dark_brick_tiles" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/diorite_bricks_from_nii_wall_1_stonecutting.json b/src/main/generated/data/new_soviet/recipes/diorite_bricks_from_nii_wall_1_stonecutting.json new file mode 100644 index 0000000..40893e4 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/diorite_bricks_from_nii_wall_1_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:nii_wall_1" + }, + "result": "new_soviet:diorite_bricks" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/glazed_brick_tiles_from_brick_tiles_stonecutting.json b/src/main/generated/data/new_soviet/recipes/glazed_brick_tiles_from_brick_tiles_stonecutting.json new file mode 100644 index 0000000..093d4a4 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/glazed_brick_tiles_from_brick_tiles_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:brick_tiles" + }, + "result": "new_soviet:glazed_brick_tiles" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/glazed_brick_tiles_from_bricks_stonecutting.json b/src/main/generated/data/new_soviet/recipes/glazed_brick_tiles_from_bricks_stonecutting.json new file mode 100644 index 0000000..6873fb4 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/glazed_brick_tiles_from_bricks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "minecraft:bricks" + }, + "result": "new_soviet:glazed_brick_tiles" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/glazed_light_blue_tiles_from_variated_light_blue_tiles_stonecutting.json b/src/main/generated/data/new_soviet/recipes/glazed_light_blue_tiles_from_variated_light_blue_tiles_stonecutting.json new file mode 100644 index 0000000..6967daf --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/glazed_light_blue_tiles_from_variated_light_blue_tiles_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:variated_light_blue_tiles" + }, + "result": "new_soviet:glazed_light_blue_tiles" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/green_bricks.json b/src/main/generated/data/new_soviet/recipes/green_bricks.json new file mode 100644 index 0000000..a997f28 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/green_bricks.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "minecraft:bricks" + }, + "G": { + "item": "minecraft:green_dye" + } + }, + "pattern": [ + "###", + "#G#", + "###" + ], + "result": { + "count": 8, + "item": "new_soviet:green_bricks" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/green_bricks_2.json b/src/main/generated/data/new_soviet/recipes/green_bricks_2.json new file mode 100644 index 0000000..86e1690 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/green_bricks_2.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "minecraft:bricks" + }, + { + "item": "new_soviet:green_bricks" + } + ], + "result": { + "count": 2, + "item": "new_soviet:green_bricks_2" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/light_blue_bricks_from_variated_light_blue_tiles_stonecutting.json b/src/main/generated/data/new_soviet/recipes/light_blue_bricks_from_variated_light_blue_tiles_stonecutting.json new file mode 100644 index 0000000..c3b0bef --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/light_blue_bricks_from_variated_light_blue_tiles_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:variated_light_blue_tiles" + }, + "result": "new_soviet:light_blue_bricks" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/light_blue_tiles_from_variated_light_blue_tiles_stonecutting.json b/src/main/generated/data/new_soviet/recipes/light_blue_tiles_from_variated_light_blue_tiles_stonecutting.json new file mode 100644 index 0000000..1aac6e8 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/light_blue_tiles_from_variated_light_blue_tiles_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:variated_light_blue_tiles" + }, + "result": "new_soviet:light_blue_tiles" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/mossy_brick_tiles.json b/src/main/generated/data/new_soviet/recipes/mossy_brick_tiles.json new file mode 100644 index 0000000..7d324bc --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/mossy_brick_tiles.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "new_soviet:brick_tiles" + }, + { + "item": "minecraft:vine" + } + ], + "result": { + "item": "new_soviet:mossy_brick_tiles" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/mossy_dark_brick_tiles.json b/src/main/generated/data/new_soviet/recipes/mossy_dark_brick_tiles.json new file mode 100644 index 0000000..7f8dbba --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/mossy_dark_brick_tiles.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "new_soviet:dark_brick_tiles" + }, + { + "item": "minecraft:vine" + } + ], + "result": { + "item": "new_soviet:mossy_dark_brick_tiles" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/mossy_green_bricks.json b/src/main/generated/data/new_soviet/recipes/mossy_green_bricks.json new file mode 100644 index 0000000..2f7969f --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/mossy_green_bricks.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "new_soviet:green_bricks" + }, + { + "item": "minecraft:vine" + } + ], + "result": { + "item": "new_soviet:mossy_green_bricks" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/mossy_green_bricks_2.json b/src/main/generated/data/new_soviet/recipes/mossy_green_bricks_2.json new file mode 100644 index 0000000..cac9371 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/mossy_green_bricks_2.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "new_soviet:green_bricks_2" + }, + { + "item": "minecraft:vine" + } + ], + "result": { + "item": "new_soviet:mossy_green_bricks_2" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/mossy_red_bricks.json b/src/main/generated/data/new_soviet/recipes/mossy_red_bricks.json new file mode 100644 index 0000000..5543495 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/mossy_red_bricks.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "new_soviet:red_bricks" + }, + { + "item": "minecraft:vine" + } + ], + "result": { + "item": "new_soviet:mossy_red_bricks" + } +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/nii_floor.json b/src/main/generated/data/new_soviet/recipes/nii_floor.json new file mode 100644 index 0000000..67747cf --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/nii_floor.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "minecraft:diorite" + }, + "C": { + "item": "minecraft:cobblestone" + }, + "G": { + "item": "minecraft:granite" + } + }, + "pattern": [ + "#G", + "GC" + ], + "result": { + "count": 4, + "item": "new_soviet:nii_floor" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/nii_wall_1_from_big_diorite_tiles_stonecutting.json b/src/main/generated/data/new_soviet/recipes/nii_wall_1_from_big_diorite_tiles_stonecutting.json new file mode 100644 index 0000000..f91870c --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/nii_wall_1_from_big_diorite_tiles_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:big_diorite_tiles" + }, + "result": "new_soviet:nii_wall_1" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/nii_wall_1_from_diorite_bricks_stonecutting.json b/src/main/generated/data/new_soviet/recipes/nii_wall_1_from_diorite_bricks_stonecutting.json new file mode 100644 index 0000000..615445d --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/nii_wall_1_from_diorite_bricks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:diorite_bricks" + }, + "result": "new_soviet:nii_wall_1" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/nii_wall_1_from_polished_diorite_stonecutting.json b/src/main/generated/data/new_soviet/recipes/nii_wall_1_from_polished_diorite_stonecutting.json new file mode 100644 index 0000000..ba7d691 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/nii_wall_1_from_polished_diorite_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "minecraft:polished_diorite" + }, + "result": "new_soviet:nii_wall_1" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/nii_wall_1_from_small_diorite_tiles_stonecutting.json b/src/main/generated/data/new_soviet/recipes/nii_wall_1_from_small_diorite_tiles_stonecutting.json new file mode 100644 index 0000000..ba8371b --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/nii_wall_1_from_small_diorite_tiles_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:small_diorite_tiles" + }, + "result": "new_soviet:nii_wall_1" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/nii_wall_2_from_smooth_stone_stonecutting.json b/src/main/generated/data/new_soviet/recipes/nii_wall_2_from_smooth_stone_stonecutting.json new file mode 100644 index 0000000..8d3f37b --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/nii_wall_2_from_smooth_stone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "minecraft:smooth_stone" + }, + "result": "new_soviet:nii_wall_2" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/nii_wall_3_from_stone_bricks_stonecutting.json b/src/main/generated/data/new_soviet/recipes/nii_wall_3_from_stone_bricks_stonecutting.json new file mode 100644 index 0000000..32f8fe9 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/nii_wall_3_from_stone_bricks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "minecraft:stone_bricks" + }, + "result": "new_soviet:nii_wall_3" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/nii_wall_3_from_stone_stonecutting.json b/src/main/generated/data/new_soviet/recipes/nii_wall_3_from_stone_stonecutting.json new file mode 100644 index 0000000..edb4640 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/nii_wall_3_from_stone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "minecraft:stone" + }, + "result": "new_soviet:nii_wall_3" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/polished_diorite_from_nii_wall_1_stonecutting.json b/src/main/generated/data/new_soviet/recipes/polished_diorite_from_nii_wall_1_stonecutting.json new file mode 100644 index 0000000..5a62e6f --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/polished_diorite_from_nii_wall_1_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:nii_wall_1" + }, + "result": "minecraft:polished_diorite" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/rake.json b/src/main/generated/data/new_soviet/recipes/rake.json new file mode 100644 index 0000000..4a1b8d0 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/rake.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "I": { + "item": "minecraft:iron_ingot" + }, + "N": { + "item": "minecraft:iron_nugget" + }, + "S": { + "item": "minecraft:stick" + } + }, + "pattern": [ + "III", + " N ", + " S " + ], + "result": { + "item": "new_soviet:rake" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/red_bricks.json b/src/main/generated/data/new_soviet/recipes/red_bricks.json new file mode 100644 index 0000000..1aeb942 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/red_bricks.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "minecraft:bricks" + }, + "R": { + "item": "minecraft:red_dye" + } + }, + "pattern": [ + "###", + "#R#", + "###" + ], + "result": { + "count": 8, + "item": "new_soviet:red_bricks" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/small_cracked_yellow_tiles.json b/src/main/generated/data/new_soviet/recipes/small_cracked_yellow_tiles.json new file mode 100644 index 0000000..633aa9c --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/small_cracked_yellow_tiles.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:smelting", + "category": "blocks", + "cookingtime": 200, + "experience": 0.1, + "ingredient": { + "item": "new_soviet:small_yellow_tiles" + }, + "result": "new_soviet:small_cracked_yellow_tiles" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/small_diorite_tiles_from_nii_wall_1_stonecutting.json b/src/main/generated/data/new_soviet/recipes/small_diorite_tiles_from_nii_wall_1_stonecutting.json new file mode 100644 index 0000000..dde7406 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/small_diorite_tiles_from_nii_wall_1_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:nii_wall_1" + }, + "result": "new_soviet:small_diorite_tiles" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/small_light_blue_tiles_from_variated_light_blue_tiles_stonecutting.json b/src/main/generated/data/new_soviet/recipes/small_light_blue_tiles_from_variated_light_blue_tiles_stonecutting.json new file mode 100644 index 0000000..87ce628 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/small_light_blue_tiles_from_variated_light_blue_tiles_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:variated_light_blue_tiles" + }, + "result": "new_soviet:small_light_blue_tiles" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/small_yellow_tiles.json b/src/main/generated/data/new_soviet/recipes/small_yellow_tiles.json new file mode 100644 index 0000000..25dc8e3 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/small_yellow_tiles.json @@ -0,0 +1,22 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "#": { + "item": "new_soviet:small_white_tiles" + }, + "Y": { + "item": "minecraft:yellow_dye" + } + }, + "pattern": [ + "###", + "#Y#", + "###" + ], + "result": { + "count": 8, + "item": "new_soviet:small_yellow_tiles" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/smooth_stone_from_nii_wall_2_stonecutting.json b/src/main/generated/data/new_soviet/recipes/smooth_stone_from_nii_wall_2_stonecutting.json new file mode 100644 index 0000000..0ad4f69 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/smooth_stone_from_nii_wall_2_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:nii_wall_2" + }, + "result": "minecraft:smooth_stone" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/stone_bricks_from_nii_wall_3_stonecutting.json b/src/main/generated/data/new_soviet/recipes/stone_bricks_from_nii_wall_3_stonecutting.json new file mode 100644 index 0000000..a2b703f --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/stone_bricks_from_nii_wall_3_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:nii_wall_3" + }, + "result": "minecraft:stone_bricks" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/stone_bricks_from_stone_stonecutting.json b/src/main/generated/data/new_soviet/recipes/stone_bricks_from_stone_stonecutting.json new file mode 100644 index 0000000..b98f379 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/stone_bricks_from_stone_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "minecraft:stone" + }, + "result": "minecraft:stone_bricks" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/stone_from_nii_wall_3_stonecutting.json b/src/main/generated/data/new_soviet/recipes/stone_from_nii_wall_3_stonecutting.json new file mode 100644 index 0000000..c622df1 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/stone_from_nii_wall_3_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:nii_wall_3" + }, + "result": "minecraft:stone" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/stone_from_stone_bricks_stonecutting.json b/src/main/generated/data/new_soviet/recipes/stone_from_stone_bricks_stonecutting.json new file mode 100644 index 0000000..749a830 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/stone_from_stone_bricks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "minecraft:stone_bricks" + }, + "result": "minecraft:stone" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/variated_light_blue_tiles_from_glazed_light_blue_tiles_stonecutting.json b/src/main/generated/data/new_soviet/recipes/variated_light_blue_tiles_from_glazed_light_blue_tiles_stonecutting.json new file mode 100644 index 0000000..87dfb4a --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/variated_light_blue_tiles_from_glazed_light_blue_tiles_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:glazed_light_blue_tiles" + }, + "result": "new_soviet:variated_light_blue_tiles" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/variated_light_blue_tiles_from_light_blue_bricks_stonecutting.json b/src/main/generated/data/new_soviet/recipes/variated_light_blue_tiles_from_light_blue_bricks_stonecutting.json new file mode 100644 index 0000000..d3f86b8 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/variated_light_blue_tiles_from_light_blue_bricks_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:light_blue_bricks" + }, + "result": "new_soviet:variated_light_blue_tiles" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/variated_light_blue_tiles_from_light_blue_tiles_stonecutting.json b/src/main/generated/data/new_soviet/recipes/variated_light_blue_tiles_from_light_blue_tiles_stonecutting.json new file mode 100644 index 0000000..0d9c806 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/variated_light_blue_tiles_from_light_blue_tiles_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:light_blue_tiles" + }, + "result": "new_soviet:variated_light_blue_tiles" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/variated_light_blue_tiles_from_small_light_blue_tiles_stonecutting.json b/src/main/generated/data/new_soviet/recipes/variated_light_blue_tiles_from_small_light_blue_tiles_stonecutting.json new file mode 100644 index 0000000..ea1dd0d --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/variated_light_blue_tiles_from_small_light_blue_tiles_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "item": "new_soviet:small_light_blue_tiles" + }, + "result": "new_soviet:variated_light_blue_tiles" +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/tags/blocks/rake.json b/src/main/generated/data/new_soviet/tags/blocks/rake.json new file mode 100644 index 0000000..b8642f9 --- /dev/null +++ b/src/main/generated/data/new_soviet/tags/blocks/rake.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "new_soviet:meat", + "new_soviet:meat_eye", + "new_soviet:meat_teeth", + "new_soviet:purple_goo" + ] +} \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/Materials/NSE_ToolMaterials.java b/src/main/java/su/a71/new_soviet/Materials/NSE_ToolMaterials.java new file mode 100644 index 0000000..09334b9 --- /dev/null +++ b/src/main/java/su/a71/new_soviet/Materials/NSE_ToolMaterials.java @@ -0,0 +1,62 @@ +package su.a71.new_soviet.Materials; + +import net.fabricmc.yarn.constants.MiningLevels; +import net.minecraft.item.Items; +import net.minecraft.item.ToolMaterial; +import net.minecraft.recipe.Ingredient; +import net.minecraft.registry.tag.ItemTags; +import net.minecraft.util.Lazy; + +import java.util.function.Supplier; + +public enum NSE_ToolMaterials implements ToolMaterial +{ + IRON_FOR_RAKE(MiningLevels.IRON, 800, 15.0f, 2.0f, 14, () -> Ingredient.ofItems(Items.IRON_INGOT)); + + private final int miningLevel; + private final int itemDurability; + private final float miningSpeed; + private final float attackDamage; + private final int enchantability; + private final Lazy repairIngredient; + + private NSE_ToolMaterials(int miningLevel, int itemDurability, float miningSpeed, float attackDamage, int enchantability, Supplier repairIngredient) { + this.miningLevel = miningLevel; + this.itemDurability = itemDurability; + this.miningSpeed = miningSpeed; + this.attackDamage = attackDamage; + this.enchantability = enchantability; + this.repairIngredient = new Lazy(repairIngredient); + } + + @Override + public int getDurability() { + return this.itemDurability; + } + + @Override + public float getMiningSpeedMultiplier() { + return this.miningSpeed; + } + + @Override + public float getAttackDamage() { + return this.attackDamage; + } + + @Override + public int getMiningLevel() { + return this.miningLevel; + } + + @Override + public int getEnchantability() { + return this.enchantability; + } + + @Override + public Ingredient getRepairIngredient() { + return this.repairIngredient.get(); + } +} + diff --git a/src/main/java/su/a71/new_soviet/blocks/LightBulbBlock.java b/src/main/java/su/a71/new_soviet/blocks/LightBulbBlock.java index 85307c5..d72d240 100644 --- a/src/main/java/su/a71/new_soviet/blocks/LightBulbBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/LightBulbBlock.java @@ -1,6 +1,8 @@ package su.a71.new_soviet.blocks; import net.minecraft.block.*; +import net.minecraft.particle.DustParticleEffect; +import net.minecraft.text.Text; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.projectile.ProjectileEntity; import net.minecraft.fluid.FluidState; @@ -25,6 +27,7 @@ import net.minecraft.world.World; import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; import org.jetbrains.annotations.Nullable; +import su.a71.new_soviet.NewSoviet; import su.a71.new_soviet.registration.NSE_Custom; import su.a71.new_soviet.registration.NSE_Items; @@ -70,15 +73,28 @@ public class LightBulbBlock extends Block implements Waterloggable { @Override public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { - if (!world.isClient && state.get(BROKEN) && player.getInventory().getMainHandStack().getItem() == NSE_Items.LIGHT_BULB) { + if (!world.isClient && state.get(BROKEN) && player.getInventory().getMainHandStack().getItem() == NSE_Items.LIGHT_BULB && !world.isReceivingRedstonePower(pos)) { if (!player.isCreative()) player.getInventory().getMainHandStack().decrement(1); - world.setBlockState(pos, (BlockState)state.with(BROKEN, false) - .with(ON, world.isReceivingRedstonePower(pos)), 2); + world.setBlockState(pos, (BlockState)state.with(BROKEN, false)); + //.with(ON, world.isReceivingRedstonePower(pos)), 2); + } else if (!world.isClient && state.get(BROKEN) && player.getInventory().getMainHandStack().getItem() == NSE_Items.LIGHT_BULB) { + player.sendMessage(Text.translatable("block.new_soviet.light_bulb_block.energized")); + world.playSound((PlayerEntity)null, pos.getX(), pos.getY(), pos.getZ(), NSE_Custom.ELECTRIC_HIT, SoundCategory.AMBIENT, 0.8f, 1f); + if (!player.isCreative()) { + player.heal(-1 * NewSoviet.RANDOM.nextBetween(1, 4)); + } + if (NewSoviet.RANDOM.nextBetween(1, 32) == 1){ + if (!player.isCreative()) + player.getInventory().getMainHandStack().decrement(1); + world.setBlockState(pos, (BlockState)state.with(BROKEN, false) + .with(ON, world.isReceivingRedstonePower(pos)), 2); + } } return super.onUse(state, world, pos, player, hand, hit); } + @Override public void onProjectileHit(World world, BlockState state, BlockHitResult hit, ProjectileEntity projectile) { if (!state.get(BROKEN)) { diff --git a/src/main/java/su/a71/new_soviet/blocks/SwitchBlock.java b/src/main/java/su/a71/new_soviet/blocks/SwitchBlock.java new file mode 100644 index 0000000..95dee14 --- /dev/null +++ b/src/main/java/su/a71/new_soviet/blocks/SwitchBlock.java @@ -0,0 +1,115 @@ +package su.a71.new_soviet.blocks; + +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.*; +import net.minecraft.block.enums.WallMountLocation; +import net.minecraft.block.piston.PistonBehavior; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.particle.DustParticleEffect; +import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.sound.SoundCategory; +import net.minecraft.sound.SoundEvents; +import net.minecraft.state.StateManager; +import net.minecraft.state.property.BooleanProperty; +import net.minecraft.state.property.Properties; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.util.math.random.Random; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.world.BlockView; +import net.minecraft.world.World; +import net.minecraft.world.WorldAccess; +import net.minecraft.world.WorldView; +import net.minecraft.world.event.GameEvent; +import su.a71.new_soviet.NewSoviet; +import su.a71.new_soviet.sounds.Sounds; + +public class SwitchBlock extends LeverBlock { + public static final BooleanProperty POWERED = Properties.POWERED; + protected static final VoxelShape NORTH_WALL_SHAPE = Block.createCuboidShape(5.5, 5.5, 15, 10.5, 10.5, 16); + protected static final VoxelShape SOUTH_WALL_SHAPE = Block.createCuboidShape(5.5, 5.5, 0, 10.5, 10.5, 1); + protected static final VoxelShape WEST_WALL_SHAPE = Block.createCuboidShape(15, 5.5, 5.5, 16, 10.5, 10.5); + protected static final VoxelShape EAST_WALL_SHAPE = Block.createCuboidShape(0.0, 5.5, 5.5, 1, 10.5, 10.5); + protected static final VoxelShape FLOOR_Z_AXIS_SHAPE = Block.createCuboidShape(5.5, 0.0, 5.5, 10.5, 1, 10.5); + protected static final VoxelShape FLOOR_X_AXIS_SHAPE = Block.createCuboidShape(5.5, 0.0, 5.5, 10.5, 1, 10.5); + protected static final VoxelShape CEILING_Z_AXIS_SHAPE = Block.createCuboidShape(5.5, 15.0, 5.5, 10.5, 16.0, 10.5); + protected static final VoxelShape CEILING_X_AXIS_SHAPE = Block.createCuboidShape(5.5, 15.0, 5.5, 10.5, 16.0, 10.5); + + public SwitchBlock(FabricBlockSettings fabricBlockSettings) { + super(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).notSolid().pistonBehavior(PistonBehavior.DESTROY).strength(1f, 2f).mapColor(MapColor.TERRACOTTA_WHITE).noCollision()); + this.setDefaultState((BlockState)((BlockState)((BlockState)((BlockState)this.stateManager.getDefaultState()).with(FACING, Direction.NORTH)).with(POWERED, false)).with(FACE, WallMountLocation.WALL)); + } + + @Override + public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { + switch ((WallMountLocation)state.get(FACE)) { + case FLOOR: { + switch (state.get(FACING).getAxis()) { + case X: { + return FLOOR_X_AXIS_SHAPE; + } + } + return FLOOR_Z_AXIS_SHAPE; + } + case WALL: { + switch (state.get(FACING)) { + case EAST: { + return EAST_WALL_SHAPE; + } + case WEST: { + return WEST_WALL_SHAPE; + } + case SOUTH: { + return SOUTH_WALL_SHAPE; + } + } + return NORTH_WALL_SHAPE; + } + } + switch (state.get(FACING).getAxis()) { + case X: { + return CEILING_X_AXIS_SHAPE; + } + } + return CEILING_Z_AXIS_SHAPE; + } + + @Override + public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { + if (world.isClient) { + BlockState blockState = (BlockState)state.cycle(POWERED); + return ActionResult.SUCCESS; + } + BlockState blockState = this.togglePower(state, world, pos); + float f = blockState.get(POWERED) != false ? 1f : 0.9f; + world.playSound(null, pos, Sounds.SWITCH_PRESS, SoundCategory.BLOCKS, 0.6f, f); + world.emitGameEvent((Entity)player, blockState.get(POWERED) != false ? GameEvent.BLOCK_ACTIVATE : GameEvent.BLOCK_DEACTIVATE, pos); + return ActionResult.CONSUME; + } + + private static void spawnParticles(BlockState state, WorldAccess world, BlockPos pos, float alpha) { + Direction direction = state.get(FACING).getOpposite(); + Direction direction2 = SwitchBlock.getDirection(state).getOpposite(); + double d = (double)pos.getX() + 0.5 + 0.1 * (double)direction.getOffsetX() + 0.2 * (double)direction2.getOffsetX(); + double e = (double)pos.getY() + 0.5 + 0.1 * (double)direction.getOffsetY() + 0.2 * (double)direction2.getOffsetY(); + double f = (double)pos.getZ() + 0.5 + 0.1 * (double)direction.getOffsetZ() + 0.2 * (double)direction2.getOffsetZ(); + world.addParticle(new DustParticleEffect(DustParticleEffect.RED, alpha), d, e, f, 0.0, 0.0, 0.0); + } + + @Override + public void randomDisplayTick(BlockState state, World world, BlockPos pos, Random random) { + if (state.get(POWERED).booleanValue() && random.nextFloat() < 0.25f) { + //SwitchBlock.spawnParticles(state, world, pos, 0.5f); + } + } + + + @Override + protected void appendProperties(StateManager.Builder builder) { + builder.add(FACE, FACING, POWERED); + } +} diff --git a/src/main/java/su/a71/new_soviet/items/DiceD20Item.java b/src/main/java/su/a71/new_soviet/items/DiceD20Item.java deleted file mode 100644 index 31016f5..0000000 --- a/src/main/java/su/a71/new_soviet/items/DiceD20Item.java +++ /dev/null @@ -1,49 +0,0 @@ -package su.a71.new_soviet.items; - -import net.minecraft.client.item.TooltipContext; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.sound.SoundCategory; -import net.minecraft.stat.Stats; -import net.minecraft.text.Text; -import net.minecraft.util.Hand; -import net.minecraft.util.TypedActionResult; -import net.minecraft.world.World; -import org.jetbrains.annotations.Nullable; -import su.a71.new_soviet.NewSoviet; -import su.a71.new_soviet.registration.NSE_Items; - -import java.util.List; - -public class DiceD20Item extends Item { - public DiceD20Item(Settings settings) { - super(settings); - } - - public TypedActionResult use(World world, PlayerEntity user, Hand hand) { - ItemStack itemStack = user.getStackInHand(hand); - user.getItemCooldownManager().set(this, 20 * itemStack.getCount()); - if (!world.isClient) { - StringBuilder output = new StringBuilder(); - for (var i = 0; i < itemStack.getCount(); i++) { - world.playSound((PlayerEntity)null, user.getX(), user.getY(), user.getZ(), NSE_Items.DICE_SOUND, SoundCategory.NEUTRAL, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F)); - output.append(NewSoviet.RANDOM.nextBetween(1, this.getSides())).append(", "); - } - user.sendMessage(Text.translatable(itemStack.getCount() == 1 ? "item.new_soviet.dice.thrown" : "item.new_soviet.dice.thrown_multiple").append(" " + output.subSequence(0, output.length() - 2))); - } - - user.increaseStat(Stats.USED.getOrCreateStat(this), itemStack.getCount()); - return TypedActionResult.success(itemStack, world.isClient()); - } - - public int getSides() { - return 20; - } - - @Override - public void appendTooltip(ItemStack stack, @Nullable World world, List tooltip, TooltipContext context) { - tooltip.add(Text.translatable("item.new_soviet.dice_d20.tooltip")); - super.appendTooltip(stack, world, tooltip, context); - } -} diff --git a/src/main/java/su/a71/new_soviet/items/DiceD4Item.java b/src/main/java/su/a71/new_soviet/items/DiceD4Item.java deleted file mode 100644 index 54d7dc0..0000000 --- a/src/main/java/su/a71/new_soviet/items/DiceD4Item.java +++ /dev/null @@ -1,49 +0,0 @@ -package su.a71.new_soviet.items; - -import net.minecraft.client.item.TooltipContext; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.sound.SoundCategory; -import net.minecraft.stat.Stats; -import net.minecraft.text.Text; -import net.minecraft.util.Hand; -import net.minecraft.util.TypedActionResult; -import net.minecraft.world.World; -import org.jetbrains.annotations.Nullable; -import su.a71.new_soviet.NewSoviet; -import su.a71.new_soviet.registration.NSE_Items; - -import java.util.List; - -public class DiceD4Item extends Item { - public DiceD4Item(Settings settings) { - super(settings); - } - - public TypedActionResult use(World world, PlayerEntity user, Hand hand) { - ItemStack itemStack = user.getStackInHand(hand); - user.getItemCooldownManager().set(this, 20 * itemStack.getCount()); - if (!world.isClient) { - StringBuilder output = new StringBuilder(); - for (var i = 0; i < itemStack.getCount(); i++) { - world.playSound((PlayerEntity)null, user.getX(), user.getY(), user.getZ(), NSE_Items.DICE_SOUND, SoundCategory.NEUTRAL, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F)); - output.append(NewSoviet.RANDOM.nextBetween(1, this.getSides())).append(", "); - } - user.sendMessage(Text.translatable(itemStack.getCount() == 1 ? "item.new_soviet.dice.thrown" : "item.new_soviet.dice.thrown_multiple").append(" " + output.subSequence(0, output.length() - 2))); - } - - user.increaseStat(Stats.USED.getOrCreateStat(this), itemStack.getCount()); - return TypedActionResult.success(itemStack, world.isClient()); - } - - public int getSides() { - return 4; - } - - @Override - public void appendTooltip(ItemStack stack, @Nullable World world, List tooltip, TooltipContext context) { - tooltip.add(Text.translatable("item.new_soviet.dice_d4.tooltip")); - super.appendTooltip(stack, world, tooltip, context); - } -} diff --git a/src/main/java/su/a71/new_soviet/items/DiceItem.java b/src/main/java/su/a71/new_soviet/items/DiceItem.java index 932922e..65ecbaa 100644 --- a/src/main/java/su/a71/new_soviet/items/DiceItem.java +++ b/src/main/java/su/a71/new_soviet/items/DiceItem.java @@ -12,13 +12,18 @@ import net.minecraft.util.TypedActionResult; import net.minecraft.world.World; import org.jetbrains.annotations.Nullable; import su.a71.new_soviet.NewSoviet; -import su.a71.new_soviet.registration.NSE_Items; +import su.a71.new_soviet.sounds.Sounds; import java.util.List; public class DiceItem extends Item { - public DiceItem(Settings settings) { + private final int sides; + private final String loacl_tooltip; + + public DiceItem(int sides, String localTooltip, Settings settings) { super(settings); + this.sides = sides; + this.loacl_tooltip = localTooltip; } public TypedActionResult use(World world, PlayerEntity user, Hand hand) { @@ -27,7 +32,7 @@ public class DiceItem extends Item { if (!world.isClient) { StringBuilder output = new StringBuilder(); for (var i = 0; i < itemStack.getCount(); i++) { - world.playSound((PlayerEntity)null, user.getX(), user.getY(), user.getZ(), NSE_Items.DICE_SOUND, SoundCategory.NEUTRAL, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F)); + world.playSound((PlayerEntity)null, user.getX(), user.getY(), user.getZ(), Sounds.DICE_SOUND, SoundCategory.NEUTRAL, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F)); output.append(NewSoviet.RANDOM.nextBetween(1, this.getSides())).append(", "); } user.sendMessage(Text.translatable(itemStack.getCount() == 1 ? "item.new_soviet.dice.thrown" : "item.new_soviet.dice.thrown_multiple").append(" " + output.subSequence(0, output.length() - 2))); @@ -38,12 +43,12 @@ public class DiceItem extends Item { } public int getSides() { - return 6; + return sides; } @Override public void appendTooltip(ItemStack stack, @Nullable World world, List tooltip, TooltipContext context) { - tooltip.add(Text.translatable("item.new_soviet.dice_d6.tooltip")); + tooltip.add(Text.translatable(loacl_tooltip)); super.appendTooltip(stack, world, tooltip, context); } } diff --git a/src/main/java/su/a71/new_soviet/items/RakeItem.java b/src/main/java/su/a71/new_soviet/items/RakeItem.java new file mode 100644 index 0000000..67a8626 --- /dev/null +++ b/src/main/java/su/a71/new_soviet/items/RakeItem.java @@ -0,0 +1,75 @@ +package su.a71.new_soviet.items; + +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; +import com.mojang.datafixers.util.Pair; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Blocks; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.item.*; +import net.minecraft.sound.SoundCategory; +import net.minecraft.util.ActionResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.World; +import net.minecraft.world.event.GameEvent; +import su.a71.new_soviet.sounds.Sounds; +import su.a71.new_soviet.util.NSE_Tags; + +import java.util.Map; +import java.util.function.Consumer; +import java.util.function.Predicate; + + + +public class RakeItem extends MiningToolItem { + + protected static final Map, Consumer>> TILLING_ACTIONS = Maps.newHashMap(ImmutableMap.of(Blocks.GRASS_BLOCK, Pair.of(HoeItem::canTillFarmland, RakeItem.createTillAction(Blocks.FARMLAND.getDefaultState())), Blocks.DIRT_PATH, Pair.of(HoeItem::canTillFarmland, RakeItem.createTillAction(Blocks.FARMLAND.getDefaultState())), Blocks.DIRT, Pair.of(HoeItem::canTillFarmland, RakeItem.createTillAction(Blocks.FARMLAND.getDefaultState())), Blocks.COARSE_DIRT, Pair.of(RakeItem::canTillFarmland, RakeItem.createTillAction(Blocks.DIRT.getDefaultState())), Blocks.ROOTED_DIRT, Pair.of(itemUsageContext -> true, RakeItem.createTillAndDropAction(Blocks.DIRT.getDefaultState(), Items.HANGING_ROOTS)))); + public RakeItem(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) { + super(attackDamage, attackSpeed, material, NSE_Tags.Blocks.RAKE_MINEABLE, settings); + } + + public ActionResult useOnBlock(ItemUsageContext context) { + BlockPos blockPos; + World world = context.getWorld(); + Pair, Consumer> pair = TILLING_ACTIONS.get(world.getBlockState(blockPos = context.getBlockPos()).getBlock()); + if (pair == null) { + return ActionResult.PASS; + } + Predicate predicate = pair.getFirst(); + Consumer consumer = pair.getSecond(); + if (predicate.test(context)) { + PlayerEntity playerEntity = context.getPlayer(); + world.playSound(playerEntity, blockPos, Sounds.ITEM_RAKE_TILL, SoundCategory.BLOCKS, 1.0f, 1.0f); + if (!world.isClient) { + consumer.accept(context); + if (playerEntity != null) { + context.getStack().damage(1, playerEntity, p -> p.sendToolBreakStatus(context.getHand())); + } + } + return ActionResult.success(world.isClient); + } + return ActionResult.PASS; + } + + public static Consumer createTillAction(BlockState result) { + return context -> { + context.getWorld().setBlockState(context.getBlockPos(), result, Block.NOTIFY_ALL | Block.REDRAW_ON_MAIN_THREAD); + context.getWorld().emitGameEvent(GameEvent.BLOCK_CHANGE, context.getBlockPos(), GameEvent.Emitter.of(context.getPlayer(), result)); + }; + } + + public static Consumer createTillAndDropAction(BlockState result, ItemConvertible droppedItem) { + return context -> { + context.getWorld().setBlockState(context.getBlockPos(), result, Block.NOTIFY_ALL | Block.REDRAW_ON_MAIN_THREAD); + context.getWorld().emitGameEvent(GameEvent.BLOCK_CHANGE, context.getBlockPos(), GameEvent.Emitter.of(context.getPlayer(), result)); + Block.dropStack(context.getWorld(), context.getBlockPos(), context.getSide(), new ItemStack(droppedItem)); + }; + } + + public static boolean canTillFarmland(ItemUsageContext context) { + return context.getSide() != Direction.DOWN && context.getWorld().getBlockState(context.getBlockPos().up()).isAir(); + } +} + diff --git a/src/main/java/su/a71/new_soviet/registration/NSE_Blocks.java b/src/main/java/su/a71/new_soviet/registration/NSE_Blocks.java index 688c0a7..510d220 100644 --- a/src/main/java/su/a71/new_soviet/registration/NSE_Blocks.java +++ b/src/main/java/su/a71/new_soviet/registration/NSE_Blocks.java @@ -12,11 +12,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKey; +import net.minecraft.resource.featuretoggle.FeatureFlag; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.text.Text; +import net.minecraft.util.DyeColor; import net.minecraft.util.Identifier; import su.a71.new_soviet.NewSoviet; import su.a71.new_soviet.blocks.ConcreteWithBarsBlock; +import su.a71.new_soviet.sounds.Sounds; import java.util.Optional; import java.util.function.Supplier; @@ -24,7 +27,7 @@ import java.util.function.Supplier; public class NSE_Blocks { // BUILDING BRICKS/TILES ==================== - public static final Block SAND_TILES = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.MUD_BRICKS).hardness(1.5f).requiresTool().resistance(6f).mapColor(MapColor.TERRACOTTA_BROWN)); + public static final Block SAND_TILES = new Block(FabricBlockSettings.create().sounds(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 Block CRACKED_SAND_TILES = new Block(FabricBlockSettings.copy(SAND_TILES)); public static final Block MOSSY_SAND_TILES = new Block(FabricBlockSettings.copy(SAND_TILES)); @@ -32,12 +35,28 @@ public class NSE_Blocks { public static final Block SMALL_CRACKED_SAND_TILES = new Block(FabricBlockSettings.copy(SAND_TILES)); public static final Block HERRINGBONE_SAND_TILES = new Block(FabricBlockSettings.copy(SAND_TILES)); public static final Block CROSS_SAND_TILES = new Block(FabricBlockSettings.copy(SAND_TILES)); - public static final Block BIG_SAND_TILES = new Block(FabricBlockSettings.copy(SAND_TILES)); + public static final Block BIG_SAND_TILES = new Block(FabricBlockSettings.copy(SAND_TILES).sounds(BlockSoundGroup.DECORATED_POT)); public static final Block SAND_BRICKS = new Block(FabricBlockSettings.copy(SAND_TILES)); public static final Block CRACKED_SAND_BRICKS = new Block(FabricBlockSettings.copy(SAND_TILES)); public static final Block MOSSY_SAND_BRICKS = new Block(FabricBlockSettings.copy(SAND_TILES)); public static final Block BIG_SAND_BRICKS = new Block(FabricBlockSettings.copy(SAND_TILES)); + //bricks + public static final Block BRICK_TILES = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).hardness(1.5f).requiresTool().resistance(6f).mapColor(MapColor.TERRACOTTA_BROWN)); + public static final Block CRACKED_BRICK_TILES = new Block(FabricBlockSettings.copy(BRICK_TILES)); + public static final Block MOSSY_BRICK_TILES = new Block(FabricBlockSettings.copy(BRICK_TILES)); + public static final Block DIRTY_BRICK_TILES = new Block(FabricBlockSettings.copy(BRICK_TILES)); + public static final Block DARK_BRICK_TILES = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).hardness(1.5f).requiresTool().resistance(6f).mapColor(MapColor.DARK_RED)); + public static final Block CRACKED_DARK_BRICK_TILES = new Block(FabricBlockSettings.copy(DARK_BRICK_TILES)); + public static final Block MOSSY_DARK_BRICK_TILES = new Block(FabricBlockSettings.copy(DARK_BRICK_TILES)); + public static final Block DIRTY_DARK_BRICK_TILES = new Block(FabricBlockSettings.copy(DARK_BRICK_TILES)); + public static final Block GLAZED_BRICK_TILES = new Block(FabricBlockSettings.copy(BRICK_TILES)); + public static final Block CRACKED_GLAZED_BRICK_TILES = new Block(FabricBlockSettings.copy(BRICK_TILES)); + //red bricks + public static final Block RED_BRICKS = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.DEEPSLATE_BRICKS).hardness(1.5f).requiresTool().resistance(6f).mapColor(MapColor.RED)); + public static final Block CRACKED_RED_BRICKS = new Block(FabricBlockSettings.copy(RED_BRICKS)); + public static final Block MOSSY_RED_BRICKS = new Block(FabricBlockSettings.copy(RED_BRICKS)); + //teal public static final Block TEAL_TILES = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).hardness(1.5f).requiresTool().resistance(6f).mapColor(MapColor.TEAL)); public static final Block CRACKED_TEAL_TILES = new Block(FabricBlockSettings.copy(TEAL_TILES)); public static final Block MOSSY_TEAL_TILES = new Block(FabricBlockSettings.copy(TEAL_TILES)); @@ -47,6 +66,16 @@ public class NSE_Blocks { public static final Block CRACKED_GLAZED_TEAL_TILES = new Block(FabricBlockSettings.copy(TEAL_TILES)); public static final Block VARIATED_TEAL_TILES = new Block(FabricBlockSettings.copy(TEAL_TILES)); + + public static final Block BIG_GREEN_TILES = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.DECORATED_POT).hardness(1.5f).requiresTool().resistance(6f).mapColor(MapColor.TEAL)); + public static final Block BIG_GREEN_TILES_CRACKED = new Block(FabricBlockSettings.copy(BIG_GREEN_TILES)); + public static final Block GREEN_BRICKS = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.NETHER_BRICKS).hardness(1.5f).requiresTool().resistance(6f).mapColor(MapColor.DARK_GREEN)); + public static final Block CRACKED_GREEN_BRICKS = new Block(FabricBlockSettings.copy(GREEN_BRICKS)); + public static final Block MOSSY_GREEN_BRICKS = new Block(FabricBlockSettings.copy(GREEN_BRICKS)); + public static final Block GREEN_BRICKS_2 = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.NETHER_BRICKS).hardness(1.5f).requiresTool().resistance(6f).mapColor(MapColor.DARK_GREEN)); + public static final Block CRACKED_GREEN_BRICKS_2 = new Block(FabricBlockSettings.copy(GREEN_BRICKS_2)); + public static final Block MOSSY_GREEN_BRICKS_2 = new Block(FabricBlockSettings.copy(GREEN_BRICKS_2)); + public static final Block AQUAMARINE_TILES = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).hardness(1.5f).requiresTool().resistance(6f).mapColor(MapColor.DARK_AQUA)); public static final Block CRACKED_AQUAMARINE_TILES = new Block(FabricBlockSettings.copy(AQUAMARINE_TILES)); public static final Block MOSSY_AQUAMARINE_TILES = new Block(FabricBlockSettings.copy(AQUAMARINE_TILES)); @@ -68,6 +97,12 @@ public class NSE_Blocks { public static final Block MOSSY_CALCITE_TILES = new Block(FabricBlockSettings.copy(Blocks.CALCITE)); public static final Block DIAGONAL_CALCITE_TILES = new Block(FabricBlockSettings.copy(Blocks.CALCITE)); + //NII WALLS + public static final Block NII_WALL_1 = new Block(FabricBlockSettings.copy(Blocks.DIORITE)); + public static final Block CRACKED_NII_WALL_1 = new Block(FabricBlockSettings.copy(NSE_Blocks.NII_WALL_1)); + public static final Block NII_WALL_2 = new Block(FabricBlockSettings.copy(NSE_Blocks.NII_WALL_1).mapColor(DyeColor.LIGHT_GRAY)); + public static final Block NII_WALL_3 = new Block(FabricBlockSettings.copy(NSE_Blocks.NII_WALL_1).mapColor(DyeColor.GRAY)); + //DRIPSTONE public static final Block DRIPSTONE_TILES = new Block(FabricBlockSettings.copy(Blocks.DRIPSTONE_BLOCK)); public static final Block CRACKED_DRIPSTONE_TILES = new Block(FabricBlockSettings.copy(Blocks.DRIPSTONE_BLOCK)); public static final Block MOSSY_DRIPSTONE_TILES = new Block(FabricBlockSettings.copy(Blocks.DRIPSTONE_BLOCK)); @@ -83,6 +118,7 @@ public class NSE_Blocks { public static final Block LIGHT_BLUE_TILES = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).strength(1.5f, 6f).requiresTool().mapColor(MapColor.LIGHT_BLUE)); public static final Block CRACKED_LIGHT_BLUE_TILES = new Block(FabricBlockSettings.copy(LIGHT_BLUE_TILES)); public static final Block MOSSY_LIGHT_BLUE_TILES = new Block(FabricBlockSettings.copy(LIGHT_BLUE_TILES)); + public static final Block VARIATED_LIGHT_BLUE_TILES = new Block(FabricBlockSettings.copy(LIGHT_BLUE_TILES).strength(1.5f, 6f).requiresTool().mapColor(MapColor.LIGHT_BLUE)); public static final Block SMALL_LIGHT_BLUE_TILES = new Block(FabricBlockSettings.copy(LIGHT_BLUE_TILES)); public static final Block SMALL_CRACKED_LIGHT_BLUE_TILES = new Block(FabricBlockSettings.copy(LIGHT_BLUE_TILES)); public static final Block GLAZED_LIGHT_BLUE_TILES = new Block(FabricBlockSettings.copy(LIGHT_BLUE_TILES)); @@ -108,9 +144,12 @@ public class NSE_Blocks { public static final Block MOSSY_TUFF_BRICKS = new Block(FabricBlockSettings.copy(Blocks.TUFF)); public static final Block SMALL_WHITE_TILES = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).strength(1.5f, 6f).requiresTool().mapColor(MapColor.WHITE)); - public static final Block SMALL_CRACKED_WHITE_TILES = new Block(FabricBlockSettings.copy(LIGHT_BLUE_TILES)); - public static final Block GLAZED_WHITE_TILES = new Block(FabricBlockSettings.copy(LIGHT_BLUE_TILES)); - public static final Block CRACKED_GLAZED_WHITE_TILES = new Block(FabricBlockSettings.copy(LIGHT_BLUE_TILES)); + public static final Block SMALL_CRACKED_WHITE_TILES = new Block(FabricBlockSettings.copy(SMALL_WHITE_TILES)); + public static final Block GLAZED_WHITE_TILES = new Block(FabricBlockSettings.copy(SMALL_WHITE_TILES)); + public static final Block CRACKED_GLAZED_WHITE_TILES = new Block(FabricBlockSettings.copy(SMALL_WHITE_TILES)); + + public static final Block SMALL_YELLOW_TILES = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).strength(1.5f, 6f).requiresTool().mapColor(MapColor.YELLOW)); + public static final Block SMALL_CRACKED_YELLOW_TILES = new Block(FabricBlockSettings.copy(SMALL_YELLOW_TILES)); public static final Block WHITEWASH = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.STONE).strength(1.5f, 6f).requiresTool().mapColor(MapColor.OFF_WHITE)); public static final Block CRACKED_WHITEWASH = new Block(FabricBlockSettings.copy(WHITEWASH)); @@ -135,29 +174,29 @@ public class NSE_Blocks { public static final Block CRACKED_GREEN_CONCRETE = new Block(FabricBlockSettings.copy(WHITE_CONCRETE).mapColor(MapColor.TERRACOTTA_GREEN)); public static final ConcreteWithBarsBlock GREEN_CONCRETE_WITH_BARS = new ConcreteWithBarsBlock(FabricBlockSettings.copy(WHITE_CONCRETE).mapColor(MapColor.TERRACOTTA_GREEN)); - // WOOD/FLOOR ====== - public static final Block HERRINGBONE_ACACIA_PLANKS = new Block(FabricBlockSettings.copy(Blocks.ACACIA_PLANKS)); - public static final Block CROSS_ACACIA_PLANKS = new Block(FabricBlockSettings.copy(Blocks.ACACIA_PLANKS)); - public static final Block HERRINGBONE_OAK_PLANKS = new Block(FabricBlockSettings.copy(Blocks.OAK_PLANKS)); - public static final Block CROSS_OAK_PLANKS = new Block(FabricBlockSettings.copy(Blocks.OAK_PLANKS)); - public static final Block HERRINGBONE_BIRCH_PLANKS = new Block(FabricBlockSettings.copy(Blocks.BIRCH_PLANKS)); - public static final Block CROSS_BIRCH_PLANKS = new Block(FabricBlockSettings.copy(Blocks.BIRCH_PLANKS)); - public static final Block HERRINGBONE_CRIMSON_PLANKS = new Block(FabricBlockSettings.copy(Blocks.CRIMSON_PLANKS)); - public static final Block CROSS_CRIMSON_PLANKS = new Block(FabricBlockSettings.copy(Blocks.CRIMSON_PLANKS)); - public static final Block HERRINGBONE_DARK_OAK_PLANKS = new Block(FabricBlockSettings.copy(Blocks.DARK_OAK_PLANKS)); - public static final Block CROSS_DARK_OAK_PLANKS = new Block(FabricBlockSettings.copy(Blocks.DARK_OAK_PLANKS)); - public static final Block HERRINGBONE_JUNGLE_PLANKS = new Block(FabricBlockSettings.copy(Blocks.JUNGLE_PLANKS)); - public static final Block CROSS_JUNGLE_PLANKS = new Block(FabricBlockSettings.copy(Blocks.JUNGLE_PLANKS)); - public static final Block HERRINGBONE_MANGROVE_PLANKS = new Block(FabricBlockSettings.copy(Blocks.MANGROVE_PLANKS)); - public static final Block CROSS_MANGROVE_PLANKS = new Block(FabricBlockSettings.copy(Blocks.MANGROVE_PLANKS)); - public static final Block HERRINGBONE_SPRUCE_PLANKS = new Block(FabricBlockSettings.copy(Blocks.SPRUCE_PLANKS)); - public static final Block CROSS_SPRUCE_PLANKS = new Block(FabricBlockSettings.copy(Blocks.SPRUCE_PLANKS)); + // WOOD/FLOOR ========== + public static final Block HERRINGBONE_ACACIA_PLANKS = new Block(FabricBlockSettings.copy(Blocks.ACACIA_PLANKS).sounds(Sounds.PARQUET_SOUNDS)); + public static final Block CROSS_ACACIA_PLANKS = new Block(FabricBlockSettings.copy(Blocks.ACACIA_PLANKS).sounds(Sounds.PARQUET_SOUNDS)); + public static final Block HERRINGBONE_OAK_PLANKS = new Block(FabricBlockSettings.copy(Blocks.OAK_PLANKS).sounds(Sounds.PARQUET_SOUNDS)); + public static final Block CROSS_OAK_PLANKS = new Block(FabricBlockSettings.copy(Blocks.OAK_PLANKS).sounds(Sounds.PARQUET_SOUNDS)); + public static final Block HERRINGBONE_BIRCH_PLANKS = new Block(FabricBlockSettings.copy(Blocks.BIRCH_PLANKS).sounds(Sounds.PARQUET_SOUNDS)); + public static final Block CROSS_BIRCH_PLANKS = new Block(FabricBlockSettings.copy(Blocks.BIRCH_PLANKS).sounds(Sounds.PARQUET_SOUNDS)); + public static final Block HERRINGBONE_CRIMSON_PLANKS = new Block(FabricBlockSettings.copy(Blocks.CRIMSON_PLANKS).sounds(Sounds.PARQUET_SOUNDS)); + public static final Block CROSS_CRIMSON_PLANKS = new Block(FabricBlockSettings.copy(Blocks.CRIMSON_PLANKS).sounds(Sounds.PARQUET_SOUNDS)); + public static final Block HERRINGBONE_DARK_OAK_PLANKS = new Block(FabricBlockSettings.copy(Blocks.DARK_OAK_PLANKS).sounds(Sounds.PARQUET_SOUNDS)); + public static final Block CROSS_DARK_OAK_PLANKS = new Block(FabricBlockSettings.copy(Blocks.DARK_OAK_PLANKS).sounds(Sounds.PARQUET_SOUNDS)); + public static final Block HERRINGBONE_JUNGLE_PLANKS = new Block(FabricBlockSettings.copy(Blocks.JUNGLE_PLANKS).sounds(Sounds.PARQUET_SOUNDS)); + public static final Block CROSS_JUNGLE_PLANKS = new Block(FabricBlockSettings.copy(Blocks.JUNGLE_PLANKS).sounds(Sounds.PARQUET_SOUNDS)); + public static final Block HERRINGBONE_MANGROVE_PLANKS = new Block(FabricBlockSettings.copy(Blocks.MANGROVE_PLANKS).sounds(Sounds.PARQUET_SOUNDS)); + public static final Block CROSS_MANGROVE_PLANKS = new Block(FabricBlockSettings.copy(Blocks.MANGROVE_PLANKS).sounds(Sounds.PARQUET_SOUNDS)); + public static final Block HERRINGBONE_SPRUCE_PLANKS = new Block(FabricBlockSettings.copy(Blocks.SPRUCE_PLANKS).sounds(Sounds.PARQUET_SOUNDS)); + public static final Block CROSS_SPRUCE_PLANKS = new Block(FabricBlockSettings.copy(Blocks.SPRUCE_PLANKS).sounds(Sounds.PARQUET_SOUNDS)); - public static final Block HERRINGBONE_PARQUET = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD).strength(2f, 3f).mapColor(MapColor.OAK_TAN)); + public static final Block HERRINGBONE_PARQUET = new Block(FabricBlockSettings.create().sounds(Sounds.PARQUET_SOUNDS).strength(2f, 3f).mapColor(MapColor.OAK_TAN)); public static final Block STRAIGHT_PARQUET = new Block(FabricBlockSettings.copy(HERRINGBONE_PARQUET)); public static final Block SEPARATED_PARQUET = new Block(FabricBlockSettings.copy(HERRINGBONE_PARQUET)); - public static final Block GREEN_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD).strength(2, 3f).mapColor(MapColor.TERRACOTTA_GREEN)); + public static final Block GREEN_LINOLEUM = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.CHERRY_WOOD).strength(2, 3f).mapColor(MapColor.TERRACOTTA_GREEN)); public static final Block BLUE_LINOLEUM = new Block(FabricBlockSettings.copy(GREEN_LINOLEUM).mapColor(MapColor.TERRACOTTA_BLUE)); public static final Block RED_LINOLEUM = new Block(FabricBlockSettings.copy(GREEN_LINOLEUM).mapColor(MapColor.TERRACOTTA_RED)); public static final Block GRAY_LINOLEUM = new Block(FabricBlockSettings.copy(GREEN_LINOLEUM).mapColor(MapColor.TERRACOTTA_GRAY)); @@ -172,7 +211,10 @@ public class NSE_Blocks { public static final DoorBlock CHISELED_SPRUCE_DOOR = new DoorBlock(FabricBlockSettings.copy(Blocks.SPRUCE_DOOR), BlockSetType.SPRUCE); public static final DoorBlock CHISELED_BIRCH_DOOR = new DoorBlock(FabricBlockSettings.copy(Blocks.BIRCH_DOOR), BlockSetType.BIRCH); - // Industrial ===================================== + + public static final Block NII_FLOOR = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.POLISHED_DEEPSLATE).strength(1.5f, 6f).requiresTool().mapColor(MapColor.GRAY)); + + // Industrial ========== public static final Block INDUSTRIAL_WARNING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).hardness(4f).resistance(6f).requiresTool().mapColor(MapColor.BLACK)); public static final Block RED_WARNING = new Block(FabricBlockSettings.copy(INDUSTRIAL_WARNING).mapColor(MapColor.RED)); public static final Block ORANGE_WARNING = new Block(FabricBlockSettings.copy(INDUSTRIAL_WARNING).mapColor(MapColor.ORANGE)); @@ -186,10 +228,21 @@ public class NSE_Blocks { public static final Block PURPLE_WARNING = new Block(FabricBlockSettings.copy(INDUSTRIAL_WARNING).mapColor(MapColor.PURPLE)); public static final Block MAGENTA_WARNING = new Block(FabricBlockSettings.copy(INDUSTRIAL_WARNING).mapColor(MapColor.MAGENTA)); - public static final Block METAL_PLATING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).hardness(5f).requiresTool().mapColor(MapColor.IRON_GRAY)); - public static final Block CRATE = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.WOOD).nonOpaque().mapColor(MapColor.OAK_TAN)); + public static final Block METAL_PLATING = new Block(FabricBlockSettings.create().sounds(BlockSoundGroup.NETHERITE).hardness(5f).requiresTool().mapColor(MapColor.IRON_GRAY)); + 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)); + // MEAT ========== + public static final Block MEAT = new Block(FabricBlockSettings.create().velocityMultiplier(0.8f).sounds(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)); + // WALLPAPER BLOCKS ========== + public static final Block GREEN_WALLPAPER = new Block(FabricBlockSettings.create().sounds(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)); + public static final Block BEIGE_WALLPAPER = new Block(FabricBlockSettings.copy(GREEN_WALLPAPER).mapColor(MapColor.DIRT_BROWN)); + + public static final SnowBlock PURPLE_GOO = new SnowBlock(FabricBlockSettings.copy(MEAT).hardness(1.2f).nonOpaque()); + private static final ItemGroup NSE_BUILDING_TAB = FabricItemGroup.builder() .icon(() -> new ItemStack(CALCITE_TILES)) .displayName(Text.translatable("itemGroup.new_soviet.building_blocks")) @@ -222,6 +275,22 @@ public class NSE_Blocks { register("cracked_sand_bricks", () -> CRACKED_SAND_BRICKS, NSE_BUILDING_TAB); register("mossy_sand_bricks", () -> MOSSY_SAND_BRICKS, NSE_BUILDING_TAB); register("big_sand_bricks", () -> BIG_SAND_BRICKS, NSE_BUILDING_TAB); + //brick + register("brick_tiles", () -> BRICK_TILES, NSE_BUILDING_TAB); + register("cracked_brick_tiles", () -> CRACKED_BRICK_TILES, NSE_BUILDING_TAB); + register("mossy_brick_tiles", () -> MOSSY_BRICK_TILES, NSE_BUILDING_TAB); + register("dirty_brick_tiles", () -> DIRTY_BRICK_TILES, NSE_BUILDING_TAB); + register("dark_brick_tiles", () -> DARK_BRICK_TILES, NSE_BUILDING_TAB); + register("cracked_dark_brick_tiles", () -> CRACKED_DARK_BRICK_TILES, NSE_BUILDING_TAB); + register("mossy_dark_brick_tiles", () -> MOSSY_DARK_BRICK_TILES, NSE_BUILDING_TAB); + register("dirty_dark_brick_tiles", () -> DIRTY_DARK_BRICK_TILES, NSE_BUILDING_TAB); + register("glazed_brick_tiles", () -> GLAZED_BRICK_TILES, NSE_BUILDING_TAB); + register("cracked_glazed_brick_tiles", () -> CRACKED_GLAZED_BRICK_TILES, NSE_BUILDING_TAB); + //red bricks + register("red_bricks", () -> RED_BRICKS, NSE_BUILDING_TAB); + register("cracked_red_bricks", () -> CRACKED_RED_BRICKS, NSE_BUILDING_TAB); + register("mossy_red_bricks", () -> MOSSY_RED_BRICKS, NSE_BUILDING_TAB); + //teal register("teal_tiles", () -> TEAL_TILES, NSE_BUILDING_TAB); register("cracked_teal_tiles", () -> CRACKED_TEAL_TILES, NSE_BUILDING_TAB); register("mossy_teal_tiles", () -> MOSSY_TEAL_TILES, NSE_BUILDING_TAB); @@ -230,6 +299,16 @@ public class NSE_Blocks { register("glazed_teal_tiles", () -> GLAZED_TEAL_TILES, NSE_BUILDING_TAB); register("cracked_glazed_teal_tiles", () -> CRACKED_GLAZED_TEAL_TILES, NSE_BUILDING_TAB); register("variated_teal_tiles", () -> VARIATED_TEAL_TILES, NSE_BUILDING_TAB); + + register("big_green_tiles", () -> BIG_GREEN_TILES, NSE_BUILDING_TAB); + register("big_green_tiles_cracked", () -> BIG_GREEN_TILES_CRACKED, NSE_BUILDING_TAB); + register("green_bricks", () -> GREEN_BRICKS, NSE_BUILDING_TAB); + register("cracked_green_bricks", () -> CRACKED_GREEN_BRICKS, NSE_BUILDING_TAB); + register("mossy_green_bricks", () -> MOSSY_GREEN_BRICKS, NSE_BUILDING_TAB); + register("green_bricks_2", () -> GREEN_BRICKS_2, NSE_BUILDING_TAB); + register("cracked_green_bricks_2", () -> CRACKED_GREEN_BRICKS_2, NSE_BUILDING_TAB); + register("mossy_green_bricks_2", () -> MOSSY_GREEN_BRICKS_2, NSE_BUILDING_TAB); + register("aquamarine_tiles", () -> AQUAMARINE_TILES, NSE_BUILDING_TAB); register("cracked_aquamarine_tiles", () -> CRACKED_AQUAMARINE_TILES, NSE_BUILDING_TAB); register("mossy_aquamarine_tiles", () -> MOSSY_AQUAMARINE_TILES, NSE_BUILDING_TAB); @@ -248,6 +327,12 @@ public class NSE_Blocks { register("cracked_calcite_tiles", () -> CRACKED_CALCITE_TILES, NSE_BUILDING_TAB); register("mossy_calcite_tiles", () -> MOSSY_CALCITE_TILES, NSE_BUILDING_TAB); register("diagonal_calcite_tiles", () -> DIAGONAL_CALCITE_TILES, NSE_BUILDING_TAB); + //nii walls + register("nii_wall_1", () -> NII_WALL_1, NSE_BUILDING_TAB); + register("cracked_nii_wall_1", () -> CRACKED_NII_WALL_1, NSE_BUILDING_TAB); + register("nii_wall_2", () -> NII_WALL_2, NSE_BUILDING_TAB); + register("nii_wall_3", () -> NII_WALL_3, NSE_BUILDING_TAB); + //dripstone register("dripstone_tiles", () -> DRIPSTONE_TILES, NSE_BUILDING_TAB); register("cracked_dripstone_tiles", () -> CRACKED_DRIPSTONE_TILES, NSE_BUILDING_TAB); register("mossy_dripstone_tiles", () -> MOSSY_DRIPSTONE_TILES, NSE_BUILDING_TAB); @@ -261,6 +346,7 @@ public class NSE_Blocks { register("light_blue_tiles", () -> LIGHT_BLUE_TILES, NSE_BUILDING_TAB); register("cracked_light_blue_tiles", () -> CRACKED_LIGHT_BLUE_TILES, NSE_BUILDING_TAB); register("mossy_light_blue_tiles", () -> MOSSY_LIGHT_BLUE_TILES, NSE_BUILDING_TAB); + register("variated_light_blue_tiles", () -> VARIATED_LIGHT_BLUE_TILES, NSE_BUILDING_TAB); register("small_light_blue_tiles", () -> SMALL_LIGHT_BLUE_TILES, NSE_BUILDING_TAB); register("small_cracked_light_blue_tiles", () -> SMALL_CRACKED_LIGHT_BLUE_TILES, NSE_BUILDING_TAB); register("glazed_light_blue_tiles", () -> GLAZED_LIGHT_BLUE_TILES, NSE_BUILDING_TAB); @@ -286,6 +372,9 @@ public class NSE_Blocks { register("glazed_white_tiles", () -> GLAZED_WHITE_TILES, NSE_BUILDING_TAB); register("cracked_glazed_white_tiles", () -> CRACKED_GLAZED_WHITE_TILES, NSE_BUILDING_TAB); + register("small_yellow_tiles", () -> SMALL_YELLOW_TILES, NSE_BUILDING_TAB); + register("small_cracked_yellow_tiles", () -> SMALL_CRACKED_YELLOW_TILES, NSE_BUILDING_TAB); + register("whitewash", () -> WHITEWASH, NSE_BUILDING_TAB); register("cracked_whitewash", () -> CRACKED_WHITEWASH, NSE_BUILDING_TAB); register("very_cracked_whitewash", () -> VERY_CRACKED_WHITEWASH, NSE_BUILDING_TAB); @@ -309,6 +398,8 @@ public class NSE_Blocks { register("cracked_green_concrete", () -> CRACKED_GREEN_CONCRETE, NSE_BUILDING_TAB); register("green_concrete_with_bars", () -> GREEN_CONCRETE_WITH_BARS, NSE_BUILDING_TAB); + register("nii_floor", () -> NII_FLOOR, NSE_BUILDING_TAB); + register("herringbone_acacia_planks", () -> HERRINGBONE_ACACIA_PLANKS, NSE_BUILDING_TAB); register("cross_acacia_planks", () -> CROSS_ACACIA_PLANKS, NSE_BUILDING_TAB); register("herringbone_oak_planks", () -> HERRINGBONE_OAK_PLANKS, NSE_BUILDING_TAB); @@ -361,6 +452,15 @@ public class NSE_Blocks { register("metal_plating", () -> METAL_PLATING, NSE_BUILDING_TAB); register("crate", () -> CRATE, NSE_BUILDING_TAB); register("concrete_wall", () -> CONCRETE_WALL, NSE_BUILDING_TAB); // TODO: Broken + + register("meat", () -> MEAT, NSE_BUILDING_TAB); + register("meat_eye", () -> MEAT_EYE, NSE_BUILDING_TAB); + register("meat_teeth", () -> MEAT_TEETH, NSE_BUILDING_TAB); + register("purple_goo", () -> PURPLE_GOO, NSE_BUILDING_TAB); + + register("green_wallpaper", () -> GREEN_WALLPAPER, NSE_BUILDING_TAB); + register("brown_wallpaper", () -> BROWN_WALLPAPER, NSE_BUILDING_TAB); + register("beige_wallpaper", () -> BEIGE_WALLPAPER, NSE_BUILDING_TAB); } public static void initFlame() { diff --git a/src/main/java/su/a71/new_soviet/registration/NSE_Custom.java b/src/main/java/su/a71/new_soviet/registration/NSE_Custom.java index de95104..cbbda57 100644 --- a/src/main/java/su/a71/new_soviet/registration/NSE_Custom.java +++ b/src/main/java/su/a71/new_soviet/registration/NSE_Custom.java @@ -9,6 +9,7 @@ import net.minecraft.block.AbstractBlock; import net.minecraft.block.Block; import net.minecraft.block.MapColor; import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.block.piston.PistonBehavior; import net.minecraft.item.BlockItem; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; @@ -36,6 +37,8 @@ public class NSE_Custom { FabricBlockEntityTypeBuilder.create(TVBlockEntity::new, TV, RED_TV, BROWN_TV).build() ); public static final RadioBlock RADIO = new RadioBlock(); + + public static final SwitchBlock SWITCH = new SwitchBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).notSolid().pistonBehavior(PistonBehavior.DESTROY).strength(1f, 2f).mapColor(MapColor.TERRACOTTA_WHITE)); public static final LampBlock LAMP = new LampBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.LANTERN).strength(1f, 1.5f).mapColor(MapColor.WHITE)); public static final LightBulbBlock LIGHT_BULB = new LightBulbBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.GLASS).strength(1f, 1.5f).mapColor(MapColor.WHITE)); public static final SoundEvent LIGHT_BULB_BROKEN_SOUND = SoundEvent.of(new Identifier(NewSoviet.MOD_ID, "light_bulb_broken_sound")); @@ -45,7 +48,9 @@ public class NSE_Custom { public static final SirenBlock SIREN = new SirenBlock(); public static final SoundEvent SIREN_SOUND = SoundEvent.of(new Identifier(NewSoviet.MOD_ID, "siren_sound")); - public static final LandMineBlock LANDMINE = new LandMineBlock(FabricBlockSettings.create().mapColor(MapColor.LIGHT_GRAY).offset(AbstractBlock.OffsetType.XZ).dynamicBounds().strength(3f, 2f)); + public static final SoundEvent ELECTRIC_HIT = SoundEvent.of(new Identifier(NewSoviet.MOD_ID, "electric_hit")); + + public static final LandMineBlock LANDMINE = new LandMineBlock(FabricBlockSettings.create().mapColor(MapColor.LIGHT_GRAY).offset(AbstractBlock.OffsetType.XZ).dynamicBounds()); private static final ItemGroup NSE_CUSTOM_TAB = FabricItemGroup.builder() .icon(() -> new ItemStack(TV)) @@ -75,6 +80,7 @@ public class NSE_Custom { register("ceiling_fan", () -> CEILING_FAN, NSE_CUSTOM_TAB); register("siren", () -> SIREN, NSE_CUSTOM_TAB); register("landmine", () -> LANDMINE, NSE_CUSTOM_TAB); + register("switch", () -> SWITCH, NSE_CUSTOM_TAB); Registry.register(Registries.SOUND_EVENT, new Identifier(NewSoviet.MOD_ID, "siren_sound"), SIREN_SOUND); Registry.register(Registries.SOUND_EVENT, new Identifier(NewSoviet.MOD_ID, "light_bulb_broken_sound"), LIGHT_BULB_BROKEN_SOUND); diff --git a/src/main/java/su/a71/new_soviet/registration/NSE_Items.java b/src/main/java/su/a71/new_soviet/registration/NSE_Items.java index 434f549..e59eb1d 100644 --- a/src/main/java/su/a71/new_soviet/registration/NSE_Items.java +++ b/src/main/java/su/a71/new_soviet/registration/NSE_Items.java @@ -1,40 +1,37 @@ package su.a71.new_soviet.registration; -import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup; import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; -import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; -import net.minecraft.block.Block; -import net.minecraft.entity.effect.StatusEffectInstance; -import net.minecraft.entity.effect.StatusEffects; import net.minecraft.item.*; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKey; -import net.minecraft.sound.BlockSoundGroup; import net.minecraft.sound.SoundEvent; import net.minecraft.text.Text; import net.minecraft.util.Identifier; import java.util.Optional; import java.util.function.Supplier; -import net.minecraft.util.Rarity; + +import su.a71.new_soviet.Materials.NSE_ToolMaterials; import su.a71.new_soviet.NewSoviet; -import su.a71.new_soviet.items.DiceD20Item; -import su.a71.new_soviet.items.DiceD4Item; import su.a71.new_soviet.items.DiceItem; +import su.a71.new_soviet.items.RakeItem; public class NSE_Items { // Like an iron axe but a hoe and slightly faster (-2.8f vs -3.1f) and a bit weaker (6 vs 6.5 damage) public static final ToolItem SICKLE = new HoeItem(ToolMaterials.IRON, 6, -2.8F, new Item.Settings()); - public static final FoodComponent COCONUT_FC = (new FoodComponent.Builder()).hunger(4).saturationModifier(1.2F).statusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 100, 1), 1.0F).statusEffect(new StatusEffectInstance(StatusEffects.ABSORPTION, 2400, 0), 1.0F).alwaysEdible().build(); - public static final Item COCONUT = new Item(new Item.Settings().food(COCONUT_FC).rarity(Rarity.EPIC)); + public static final RakeItem RAKE = new RakeItem(NSE_ToolMaterials.IRON_FOR_RAKE, 6, -2.6F, new Item.Settings()); - public static final DiceItem DICE_D6 = new DiceItem(new Item.Settings().maxCount(6)); - public static final DiceD4Item DICE_D4 = new DiceD4Item(new Item.Settings().maxCount(6)); - public static final DiceD20Item DICE_D20 = new DiceD20Item(new Item.Settings().maxCount(6)); - public static final SoundEvent DICE_SOUND = SoundEvent.of(new Identifier("new_soviet", "dice_sound")); + //public static final FoodComponent COCONUT_FC = (new FoodComponent.Builder()).hunger(4).saturationModifier(1.2F).statusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 100, 1), 1.0F).statusEffect(new StatusEffectInstance(StatusEffects.ABSORPTION, 2400, 0), 1.0F).alwaysEdible().build(); + public static final FoodComponent CONCENTRATE_FC = (new FoodComponent.Builder()).hunger(5).saturationModifier(1.0F).alwaysEdible().build(); + public static final Item CONCENTRATE = new Item(new Item.Settings().food(CONCENTRATE_FC)); + //public static final Item COCONUT = new Item(new Item.Settings().food(COCONUT_FC).rarity(Rarity.EPIC)); + + public static final DiceItem DICE_D6 = new DiceItem(6, "item.new_soviet.dice_d6.tooltip", new Item.Settings().maxCount(6)); + public static final DiceItem DICE_D4 = new DiceItem(4, "item.new_soviet.dice_d4.tooltip", new Item.Settings().maxCount(6)); + 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()); @@ -56,12 +53,12 @@ public class NSE_Items { public static void init() { Registry.register(Registries.ITEM_GROUP, new Identifier("new_soviet", "items"), NSE_ITEMS_TAB); register("sickle", () -> SICKLE, NSE_ITEMS_TAB); - register("coconut", () -> COCONUT, NSE_ITEMS_TAB); + register("rake", () -> RAKE, NSE_ITEMS_TAB); + register("concentrate", () -> CONCENTRATE, NSE_ITEMS_TAB); + //register("coconut", () -> COCONUT, NSE_ITEMS_TAB); register("dice_d6", () -> DICE_D6, NSE_ITEMS_TAB); register("dice_d4", () -> DICE_D4, NSE_ITEMS_TAB); register("dice_d20", () -> DICE_D20, NSE_ITEMS_TAB); register("light_bulb_item", () -> LIGHT_BULB, NSE_ITEMS_TAB); - - Registry.register(Registries.SOUND_EVENT, new Identifier("new_soviet", "dice_sound"), DICE_SOUND); } } diff --git a/src/main/java/su/a71/new_soviet/sounds/Sounds.java b/src/main/java/su/a71/new_soviet/sounds/Sounds.java new file mode 100644 index 0000000..4ea99a0 --- /dev/null +++ b/src/main/java/su/a71/new_soviet/sounds/Sounds.java @@ -0,0 +1,45 @@ +package su.a71.new_soviet.sounds; + +import net.minecraft.block.Blocks; +import net.minecraft.sound.SoundEvents; +import su.a71.new_soviet.NewSoviet; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.sound.BlockSoundGroup; +import net.minecraft.sound.SoundEvent; +import net.minecraft.util.Identifier; + +public class Sounds { + //dice sound + public static SoundEvent DICE_SOUND = registerSoundEvent("dice_sound"); + //parquet sounds + public static SoundEvent PARQUET_WALK = registerSoundEvent("parquet_walk"); + public static final BlockSoundGroup PARQUET_SOUNDS = new BlockSoundGroup(1f, 1f, + BlockSoundGroup.CHERRY_WOOD.getBreakSound(), Sounds.PARQUET_WALK, BlockSoundGroup.CHERRY_WOOD.getPlaceSound(), + BlockSoundGroup.CHERRY_WOOD.getHitSound(), Sounds.PARQUET_WALK); + + //meat sounds + public static final BlockSoundGroup MEAT_SOUNDS = new BlockSoundGroup(1f, 1f, + BlockSoundGroup.MUD.getBreakSound(), BlockSoundGroup.HONEY.getStepSound(), BlockSoundGroup.MUD.getPlaceSound(), + BlockSoundGroup.MUD.getHitSound(), BlockSoundGroup.HONEY.getStepSound()); + + //switch sound + public static SoundEvent SWITCH_PRESS = registerSoundEvent("switch_press"); + + //sand tiles sounds + public static final BlockSoundGroup SAND_TILES_SOUNDS = new BlockSoundGroup(1f, 0.8f, + BlockSoundGroup.MUD_BRICKS.getBreakSound(), BlockSoundGroup.DECORATED_POT.getStepSound(), BlockSoundGroup.MUD_BRICKS.getPlaceSound(), + BlockSoundGroup.MUD_BRICKS.getHitSound(), BlockSoundGroup.DECORATED_POT.getStepSound()); + + //wallpaper block sounds + public static final BlockSoundGroup WALLPAPER_BLOCK_SOUNDS = new BlockSoundGroup(1f, 0.7f, + BlockSoundGroup.BAMBOO_WOOD.getBreakSound(), BlockSoundGroup.WOOL.getStepSound(), BlockSoundGroup.BAMBOO_WOOD.getPlaceSound(), + BlockSoundGroup.WOOL.getHitSound(), BlockSoundGroup.WOOL.getStepSound()); + //rake sound + public static SoundEvent ITEM_RAKE_TILL = registerSoundEvent("item_rake_till"); + + private static SoundEvent registerSoundEvent(String name) { + Identifier id = new Identifier(NewSoviet.MOD_ID, name); + return Registry.register(Registries.SOUND_EVENT, id, SoundEvent.of(id)); + } +} \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/util/NSE_Tags.java b/src/main/java/su/a71/new_soviet/util/NSE_Tags.java new file mode 100644 index 0000000..986a478 --- /dev/null +++ b/src/main/java/su/a71/new_soviet/util/NSE_Tags.java @@ -0,0 +1,17 @@ +package su.a71.new_soviet.util; + +import net.minecraft.block.Block; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.tag.TagKey; +import net.minecraft.util.Identifier; +import su.a71.new_soviet.NewSoviet; + +public class NSE_Tags { + public class Blocks { + public static final TagKey RAKE_MINEABLE = + createTag("rake"); + private static TagKey createTag(String name) { + return TagKey.of(RegistryKeys.BLOCK, new Identifier(NewSoviet.MOD_ID, name)); + } + } +} diff --git a/src/main/resources/assets/new_soviet/blockstates/beige_wallpaper.json b/src/main/resources/assets/new_soviet/blockstates/beige_wallpaper.json new file mode 100644 index 0000000..b14f768 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/beige_wallpaper.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/beige_wallpaper" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/big_green_tiles.json b/src/main/resources/assets/new_soviet/blockstates/big_green_tiles.json new file mode 100644 index 0000000..ac5d3b4 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/big_green_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/big_green_tiles" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/big_green_tiles_cracked.json b/src/main/resources/assets/new_soviet/blockstates/big_green_tiles_cracked.json new file mode 100644 index 0000000..a296759 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/big_green_tiles_cracked.json @@ -0,0 +1,13 @@ +{ + "variants": { + "": [{ + "model": "new_soviet:block/big_green_tiles_cracked_1" + }, + { + "model": "new_soviet:block/big_green_tiles_cracked_2" + }, + { + "model": "new_soviet:block/big_green_tiles_cracked_3" + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/brick_tiles.json b/src/main/resources/assets/new_soviet/blockstates/brick_tiles.json new file mode 100644 index 0000000..31496ff --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/brick_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/brick_tiles" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/brown_wallpaper.json b/src/main/resources/assets/new_soviet/blockstates/brown_wallpaper.json new file mode 100644 index 0000000..a098c8d --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/brown_wallpaper.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/brown_wallpaper" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/cracked_brick_tiles.json b/src/main/resources/assets/new_soviet/blockstates/cracked_brick_tiles.json new file mode 100644 index 0000000..c4b4fbb --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/cracked_brick_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/cracked_brick_tiles" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/cracked_dark_brick_tiles.json b/src/main/resources/assets/new_soviet/blockstates/cracked_dark_brick_tiles.json new file mode 100644 index 0000000..2270e9b --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/cracked_dark_brick_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/cracked_dark_brick_tiles" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/cracked_glazed_brick_tiles.json b/src/main/resources/assets/new_soviet/blockstates/cracked_glazed_brick_tiles.json new file mode 100644 index 0000000..b4b1fce --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/cracked_glazed_brick_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/cracked_glazed_brick_tiles" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/cracked_green_bricks.json b/src/main/resources/assets/new_soviet/blockstates/cracked_green_bricks.json new file mode 100644 index 0000000..d328ff2 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/cracked_green_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/cracked_green_bricks" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/cracked_green_bricks_2.json b/src/main/resources/assets/new_soviet/blockstates/cracked_green_bricks_2.json new file mode 100644 index 0000000..06a8cce --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/cracked_green_bricks_2.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/cracked_green_bricks_2" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/cracked_nii_wall_1.json b/src/main/resources/assets/new_soviet/blockstates/cracked_nii_wall_1.json new file mode 100644 index 0000000..d72bba1 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/cracked_nii_wall_1.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/cracked_nii_wall_1" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/cracked_red_bricks.json b/src/main/resources/assets/new_soviet/blockstates/cracked_red_bricks.json new file mode 100644 index 0000000..a1aac36 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/cracked_red_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/cracked_red_bricks" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/dark_brick_tiles.json b/src/main/resources/assets/new_soviet/blockstates/dark_brick_tiles.json new file mode 100644 index 0000000..fc628dd --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/dark_brick_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/dark_brick_tiles" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/dirty_brick_tiles.json b/src/main/resources/assets/new_soviet/blockstates/dirty_brick_tiles.json new file mode 100644 index 0000000..7bd686f --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/dirty_brick_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/dirty_brick_tiles" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/dirty_dark_brick_tiles.json b/src/main/resources/assets/new_soviet/blockstates/dirty_dark_brick_tiles.json new file mode 100644 index 0000000..aa6ec43 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/dirty_dark_brick_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/dirty_dark_brick_tiles" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/glazed_brick_tiles.json b/src/main/resources/assets/new_soviet/blockstates/glazed_brick_tiles.json new file mode 100644 index 0000000..5b9e477 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/glazed_brick_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/glazed_brick_tiles" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/green_bricks.json b/src/main/resources/assets/new_soviet/blockstates/green_bricks.json new file mode 100644 index 0000000..ac19b45 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/green_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/green_bricks" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/green_bricks_2.json b/src/main/resources/assets/new_soviet/blockstates/green_bricks_2.json new file mode 100644 index 0000000..7430513 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/green_bricks_2.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/green_bricks_2" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/green_wallpaper.json b/src/main/resources/assets/new_soviet/blockstates/green_wallpaper.json new file mode 100644 index 0000000..ab7f3aa --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/green_wallpaper.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/green_wallpaper" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/meat.json b/src/main/resources/assets/new_soviet/blockstates/meat.json new file mode 100644 index 0000000..d11af98 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/meat.json @@ -0,0 +1,14 @@ +{ + "variants": { + "": [{ + "model": "new_soviet:block/meat_1" + }, + { + "model": "new_soviet:block/meat_2" + }, + { + "model": "new_soviet:block/meat_3" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/meat_eye.json b/src/main/resources/assets/new_soviet/blockstates/meat_eye.json new file mode 100644 index 0000000..94fdadb --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/meat_eye.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/meat_eye" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/meat_teeth.json b/src/main/resources/assets/new_soviet/blockstates/meat_teeth.json new file mode 100644 index 0000000..0f3e861 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/meat_teeth.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/meat_teeth" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/mossy_brick_tiles.json b/src/main/resources/assets/new_soviet/blockstates/mossy_brick_tiles.json new file mode 100644 index 0000000..834e52c --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/mossy_brick_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/mossy_brick_tiles" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/mossy_dark_brick_tiles.json b/src/main/resources/assets/new_soviet/blockstates/mossy_dark_brick_tiles.json new file mode 100644 index 0000000..93ecff0 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/mossy_dark_brick_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/mossy_dark_brick_tiles" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/mossy_green_bricks.json b/src/main/resources/assets/new_soviet/blockstates/mossy_green_bricks.json new file mode 100644 index 0000000..9fc4788 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/mossy_green_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/mossy_green_bricks" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/mossy_green_bricks_2.json b/src/main/resources/assets/new_soviet/blockstates/mossy_green_bricks_2.json new file mode 100644 index 0000000..22fda3b --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/mossy_green_bricks_2.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/mossy_green_bricks_2" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/mossy_red_bricks.json b/src/main/resources/assets/new_soviet/blockstates/mossy_red_bricks.json new file mode 100644 index 0000000..730f452 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/mossy_red_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/mossy_red_bricks" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/nii_floor.json b/src/main/resources/assets/new_soviet/blockstates/nii_floor.json new file mode 100644 index 0000000..85a21c8 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/nii_floor.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/nii_floor" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/nii_wall_1.json b/src/main/resources/assets/new_soviet/blockstates/nii_wall_1.json new file mode 100644 index 0000000..f2f2039 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/nii_wall_1.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/nii_wall_1" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/nii_wall_2.json b/src/main/resources/assets/new_soviet/blockstates/nii_wall_2.json new file mode 100644 index 0000000..d4987a0 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/nii_wall_2.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/nii_wall_2" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/nii_wall_3.json b/src/main/resources/assets/new_soviet/blockstates/nii_wall_3.json new file mode 100644 index 0000000..fc32f6c --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/nii_wall_3.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/nii_wall_3" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/purple_goo.json b/src/main/resources/assets/new_soviet/blockstates/purple_goo.json new file mode 100644 index 0000000..72a07a4 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/purple_goo.json @@ -0,0 +1,28 @@ +{ + "variants": { + "layers=1": { + "model": "new_soviet:block/purple_goo_1" + }, + "layers=2": { + "model": "new_soviet:block/purple_goo_2" + }, + "layers=3": { + "model": "new_soviet:block/purple_goo_3" + }, + "layers=4": { + "model": "new_soviet:block/purple_goo_4" + }, + "layers=5": { + "model": "new_soviet:block/purple_goo_5" + }, + "layers=6": { + "model": "new_soviet:block/purple_goo_6" + }, + "layers=7": { + "model": "new_soviet:block/purple_goo_7" + }, + "layers=8": { + "model": "new_soviet:block/purple_goo_8" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/red_bricks.json b/src/main/resources/assets/new_soviet/blockstates/red_bricks.json new file mode 100644 index 0000000..ba4886c --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/red_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/red_bricks" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/small_cracked_yellow_tiles.json b/src/main/resources/assets/new_soviet/blockstates/small_cracked_yellow_tiles.json new file mode 100644 index 0000000..92863c2 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/small_cracked_yellow_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/small_cracked_yellow_tiles" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/small_yellow_tiles.json b/src/main/resources/assets/new_soviet/blockstates/small_yellow_tiles.json new file mode 100644 index 0000000..169f534 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/small_yellow_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/small_yellow_tiles" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/switch.json b/src/main/resources/assets/new_soviet/blockstates/switch.json new file mode 100644 index 0000000..12a6441 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/switch.json @@ -0,0 +1,110 @@ +{ + "variants": { + "face=ceiling,facing=east,powered=false": { + "model": "new_soviet:block/switch_type_1_on", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=east,powered=true": { + "model": "new_soviet:block/switch_type_1_off", + "x": 180, + "y": 270 + }, + "face=ceiling,facing=north,powered=false": { + "model": "new_soviet:block/switch_type_1_on", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=north,powered=true": { + "model": "new_soviet:block/switch_type_1_off", + "x": 180, + "y": 180 + }, + "face=ceiling,facing=south,powered=false": { + "model": "new_soviet:block/switch_type_1_on", + "x": 180 + }, + "face=ceiling,facing=south,powered=true": { + "model": "new_soviet:block/switch_type_1_off", + "x": 180 + }, + "face=ceiling,facing=west,powered=false": { + "model": "new_soviet:block/switch_type_1_on", + "x": 180, + "y": 90 + }, + "face=ceiling,facing=west,powered=true": { + "model": "new_soviet:block/switch_type_1_off", + "x": 180, + "y": 90 + }, + "face=floor,facing=east,powered=false": { + "model": "new_soviet:block/switch_type_1_on", + "y": 90 + }, + "face=floor,facing=east,powered=true": { + "model": "new_soviet:block/switch_type_1_off", + "y": 90 + }, + "face=floor,facing=north,powered=false": { + "model": "new_soviet:block/switch_type_1_on" + }, + "face=floor,facing=north,powered=true": { + "model": "new_soviet:block/switch_type_1_off" + }, + "face=floor,facing=south,powered=false": { + "model": "new_soviet:block/switch_type_1_on", + "y": 180 + }, + "face=floor,facing=south,powered=true": { + "model": "new_soviet:block/switch_type_1_off", + "y": 180 + }, + "face=floor,facing=west,powered=false": { + "model": "new_soviet:block/switch_type_1_on", + "y": 270 + }, + "face=floor,facing=west,powered=true": { + "model": "new_soviet:block/switch_type_1_off", + "y": 270 + }, + "face=wall,facing=east,powered=false": { + "model": "new_soviet:block/switch_type_1_on", + "x": 90, + "y": 90 + }, + "face=wall,facing=east,powered=true": { + "model": "new_soviet:block/switch_type_1_off", + "x": 90, + "y": 90 + }, + "face=wall,facing=north,powered=false": { + "model": "new_soviet:block/switch_type_1_on", + "x": 90 + }, + "face=wall,facing=north,powered=true": { + "model": "new_soviet:block/switch_type_1_off", + "x": 90 + }, + "face=wall,facing=south,powered=false": { + "model": "new_soviet:block/switch_type_1_on", + "x": 90, + "y": 180 + }, + "face=wall,facing=south,powered=true": { + "model": "new_soviet:block/switch_type_1_off", + "x": 90, + "y": 180 + }, + "face=wall,facing=west,powered=false": { + "model": "new_soviet:block/switch_type_1_on", + "x": 90, + "y": 270 + }, + "face=wall,facing=west,powered=true": { + "model": "new_soviet:block/switch_type_1_off", + "x": 90, + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/blockstates/variated_light_blue_tiles.json b/src/main/resources/assets/new_soviet/blockstates/variated_light_blue_tiles.json new file mode 100644 index 0000000..75c78ff --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/variated_light_blue_tiles.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "new_soviet:block/variated_light_blue_tiles" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/lang/en_us.json b/src/main/resources/assets/new_soviet/lang/en_us.json index a23fb45..2911e9f 100644 --- a/src/main/resources/assets/new_soviet/lang/en_us.json +++ b/src/main/resources/assets/new_soviet/lang/en_us.json @@ -14,6 +14,19 @@ "block.new_soviet.cracked_sand_bricks": "Cracked Sand Bricks", "block.new_soviet.mossy_sand_bricks": "Mossy Sand Bricks", "block.new_soviet.big_sand_bricks": "Big Sand Bricks", + "block.new_soviet.brick_tiles": "Brick Tiles", + "block.new_soviet.cracked_brick_tiles": "Cracked Brick Tiles", + "block.new_soviet.mossy_brick_tiles": "Mossy Brick Tiles", + "block.new_soviet.dirty_brick_tiles": "Dirty Brick Tiles", + "block.new_soviet.dark_brick_tiles": "Dark Brick Tiles", + "block.new_soviet.cracked_dark_brick_tiles": "Cracked Dark Brick Tiles", + "block.new_soviet.mossy_dark_brick_tiles": "Mossy Dark Brick Tiles", + "block.new_soviet.dirty_dark_brick_tiles": "Dirty Dark Brick Tiles", + "block.new_soviet.glazed_brick_tiles": "Glazed Brick Tiles", + "block.new_soviet.cracked_glazed_brick_tiles": "Cracked Glazed Brick Tiles", + "block.new_soviet.red_bricks": "Red Bricks", + "block.new_soviet.cracked_red_bricks": "Cracked Red Bricks", + "block.new_soviet.mossy_red_bricks": "Mossy Red Bricks", "block.new_soviet.teal_tiles": "Teal Tiles", "block.new_soviet.cracked_teal_tiles": "Cracked Teal Tiles", "block.new_soviet.mossy_teal_tiles": "Mossy Teal Tiles", @@ -50,7 +63,17 @@ "block.new_soviet.small_deepslate_tiles": "Small Deepslate Tiles", "block.new_soviet.small_cracked_deepslate_tiles": "Small Cracked Deepslate Tiles", "block.new_soviet.diagonal_deepslate_tiles": "Diagonal Deepslate Tiles", + "block.new_soviet.nii_floor": "RI floor", + "block.new_soviet.big_green_tiles": "Big Green Tiles", + "block.new_soviet.big_green_tiles_cracked": "Cracked Big Green Tiles", + "block.new_soviet.green_bricks": "Green Bricks", + "block.new_soviet.cracked_green_bricks": "Cracked Green Bricks", + "block.new_soviet.mossy_green_bricks": "Mossy Green Bricks", + "block.new_soviet.green_bricks_2": "Green Bricks (Mixed)", + "block.new_soviet.cracked_green_bricks_2": "Cracked Green Bricks (Mixed)", + "block.new_soviet.mossy_green_bricks_2": "Mossy Green Bricks (Mixed)", "block.new_soviet.light_blue_tiles": "Light Blue Tiles", + "block.new_soviet.variated_light_blue_tiles": "Variated Light Blue Tiles", "block.new_soviet.cracked_light_blue_tiles": "Cracked Light Blue Tiles", "block.new_soviet.mossy_light_blue_tiles": "Mossy Light Blue Tiles", "block.new_soviet.small_light_blue_tiles": "Small Light Blue Tiles", @@ -162,5 +185,24 @@ "block.new_soviet.red_concrete_with_bars": "Red Concrete With Bars", "subtitles.new_soviet.light_bulb_broken": "Light bulb breaks", "block.new_soviet.light_bulb": "Light Bulb Lamp", - "item.new_soviet.light_bulb_item": "Light Bulb" + "item.new_soviet.light_bulb_item": "Light Bulb", + "block.new_soviet.light_bulb_block.energized": "Turn off the power!", + "block.new_soviet.crate": "Crate", + "block.new_soviet.meat": "Meat block", + "block.new_soviet.meat_eye": "Meat block with eye", + "block.new_soviet.meat_teeth": "Meat block with teeth", + "item.new_soviet.rake": "Rake", + "item.new_soviet.concentrate": "Concentrate", + "block.new_soviet.switch": "Switch", + "block.new_soviet.nii_wall_1": "Diorite RI Wall", + "block.new_soviet.cracked_nii_wall_1": "Cracked Diorite RI Wall", + "block.new_soviet.nii_wall_2": "RI Wall", + "block.new_soviet.nii_wall_3": "Stone RI Wall", + "block.new_soviet.small_yellow_tiles": "Small Yellow Tiles", + "block.new_soviet.small_cracked_yellow_tiles": "Small Cracked Yellow Tiles", + "block.new_soviet.green_wallpaper": "Green Wallpaper Block", + "block.new_soviet.brown_wallpaper": "Brown Wallpaper Block", + "block.new_soviet.beige_wallpaper": "Beige Wallpaper Block", + "block.new_soviet.purple_goo": "Purple Goo", + "subtitles.new_soviet.switch_press": "Switch clicks" } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/beige_wallpaper.json b/src/main/resources/assets/new_soviet/models/block/beige_wallpaper.json new file mode 100644 index 0000000..87ee53b --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/beige_wallpaper.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/wallpapers/beige_wallpaper", + "particle": "new_soviet:block/wallpapers/beige_wallpaper" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/big_green_tiles.json b/src/main/resources/assets/new_soviet/models/block/big_green_tiles.json new file mode 100644 index 0000000..a471471 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/big_green_tiles.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/green/big_green_tiles", + "particle": "new_soviet:block/green/big_green_tiles" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/big_green_tiles_cracked_1.json b/src/main/resources/assets/new_soviet/models/block/big_green_tiles_cracked_1.json new file mode 100644 index 0000000..fc927fb --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/big_green_tiles_cracked_1.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/green/variated/big_green_tiles_cracked_1", + "particle": "new_soviet:block/green/variated/big_green_tiles_cracked_1" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/big_green_tiles_cracked_2.json b/src/main/resources/assets/new_soviet/models/block/big_green_tiles_cracked_2.json new file mode 100644 index 0000000..bf7aba5 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/big_green_tiles_cracked_2.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/green/variated/big_green_tiles_cracked_2", + "particle": "new_soviet:block/green/variated/big_green_tiles_cracked_2" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/big_green_tiles_cracked_3.json b/src/main/resources/assets/new_soviet/models/block/big_green_tiles_cracked_3.json new file mode 100644 index 0000000..0bfdd74 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/big_green_tiles_cracked_3.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/green/variated/big_green_tiles_cracked_3", + "particle": "new_soviet:block/green/variated/big_green_tiles_cracked_3" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/brick_tiles.json b/src/main/resources/assets/new_soviet/models/block/brick_tiles.json new file mode 100644 index 0000000..10a019f --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/brick_tiles.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/brown/brown_tiles", + "particle": "new_soviet:block/brown/brown_tiles" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/brown_tv.json b/src/main/resources/assets/new_soviet/models/block/brown_tv.json index 836e5c7..77082dc 100644 --- a/src/main/resources/assets/new_soviet/models/block/brown_tv.json +++ b/src/main/resources/assets/new_soviet/models/block/brown_tv.json @@ -2,6 +2,6 @@ "parent": "new_soviet:block/tv", "textures": { "0": "new_soviet:block/custom/electronics/brown_television", - "particle": "new_soviet:block/custom/electronics/brown_television" + "particle": "new_soviet:block/custom/electronics/brown_television_particle" } } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/brown_wallpaper.json b/src/main/resources/assets/new_soviet/models/block/brown_wallpaper.json new file mode 100644 index 0000000..d2d6526 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/brown_wallpaper.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/wallpapers/brown_wallpaper", + "particle": "new_soviet:block/wallpapers/brown_wallpaper" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/ceiling_fan_off.json b/src/main/resources/assets/new_soviet/models/block/ceiling_fan_off.json index 878558a..3687c54 100644 --- a/src/main/resources/assets/new_soviet/models/block/ceiling_fan_off.json +++ b/src/main/resources/assets/new_soviet/models/block/ceiling_fan_off.json @@ -4,7 +4,7 @@ "textures": { "1": "new_soviet:block/custom/appliances/fan_base", "2": "new_soviet:block/custom/appliances/fan_static", - "particle": "new_soviet:block/custom/appliances/fan_animated" + "particle": "new_soviet:block/custom/appliances/fan_base_particle" }, "elements": [ { diff --git a/src/main/resources/assets/new_soviet/models/block/ceiling_fan_on.json b/src/main/resources/assets/new_soviet/models/block/ceiling_fan_on.json index 24e3e19..4cad0af 100644 --- a/src/main/resources/assets/new_soviet/models/block/ceiling_fan_on.json +++ b/src/main/resources/assets/new_soviet/models/block/ceiling_fan_on.json @@ -4,7 +4,7 @@ "textures": { "0": "new_soviet:block/custom/appliances/fan_animated", "1": "new_soviet:block/custom/appliances/fan_base", - "particle": "new_soviet:block/custom/appliances/fan_animated" + "particle": "new_soviet:block/custom/appliances/fan_base_particle" }, "elements": [ { diff --git a/src/main/resources/assets/new_soviet/models/block/cracked_brick_tiles.json b/src/main/resources/assets/new_soviet/models/block/cracked_brick_tiles.json new file mode 100644 index 0000000..f7893de --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/cracked_brick_tiles.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/brown/cracked_brown_tiles", + "particle": "new_soviet:block/brown/cracked_brown_tiles" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/cracked_dark_brick_tiles.json b/src/main/resources/assets/new_soviet/models/block/cracked_dark_brick_tiles.json new file mode 100644 index 0000000..7e9cac2 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/cracked_dark_brick_tiles.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/brown/cracked_dark_brown_tiles", + "particle": "new_soviet:block/brown/cracked_dark_brown_tiles" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/cracked_glazed_brick_tiles.json b/src/main/resources/assets/new_soviet/models/block/cracked_glazed_brick_tiles.json new file mode 100644 index 0000000..72e1c48 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/cracked_glazed_brick_tiles.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/red/cracked_glazed_red_tiles", + "particle": "new_soviet:block/red/cracked_glazed_red_tiles" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/cracked_green_bricks.json b/src/main/resources/assets/new_soviet/models/block/cracked_green_bricks.json new file mode 100644 index 0000000..aa72e0d --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/cracked_green_bricks.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/green/cracked_green_bricks", + "particle": "new_soviet:block/green/cracked_green_bricks" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/cracked_green_bricks_2.json b/src/main/resources/assets/new_soviet/models/block/cracked_green_bricks_2.json new file mode 100644 index 0000000..cf89a41 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/cracked_green_bricks_2.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/green/green_bricks_with_any_cracked", + "particle": "new_soviet:block/green/green_bricks_with_any_cracked" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/cracked_nii_wall_1.json b/src/main/resources/assets/new_soviet/models/block/cracked_nii_wall_1.json new file mode 100644 index 0000000..c8d89d2 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/cracked_nii_wall_1.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/research_institute/cracked_nii_wall_1", + "particle": "new_soviet:block/research_institute/cracked_nii_wall_1" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/cracked_red_bricks.json b/src/main/resources/assets/new_soviet/models/block/cracked_red_bricks.json new file mode 100644 index 0000000..2ade537 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/cracked_red_bricks.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/red/cracked_red_bricks", + "particle": "new_soviet:block/red/cracked_red_bricks" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/dark_brick_tiles.json b/src/main/resources/assets/new_soviet/models/block/dark_brick_tiles.json new file mode 100644 index 0000000..616f6d4 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/dark_brick_tiles.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/brown/dark_brown_tiles", + "particle": "new_soviet:block/brown/dark_brown_tiles" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/dirty_brick_tiles.json b/src/main/resources/assets/new_soviet/models/block/dirty_brick_tiles.json new file mode 100644 index 0000000..9a93e9f --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/dirty_brick_tiles.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/brown/dirty_brown_tiles", + "particle": "new_soviet:block/brown/dirty_brown_tiles" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/dirty_dark_brick_tiles.json b/src/main/resources/assets/new_soviet/models/block/dirty_dark_brick_tiles.json new file mode 100644 index 0000000..39c6af1 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/dirty_dark_brick_tiles.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/brown/dirty_dark_brown_tiles", + "particle": "new_soviet:block/brown/dirty_dark_brown_tiles" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/glazed_brick_tiles.json b/src/main/resources/assets/new_soviet/models/block/glazed_brick_tiles.json new file mode 100644 index 0000000..97ceea5 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/glazed_brick_tiles.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/red/glazed_red_tiles", + "particle": "new_soviet:block/red/glazed_red_tiles" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/green_bricks.json b/src/main/resources/assets/new_soviet/models/block/green_bricks.json new file mode 100644 index 0000000..e2de718 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/green_bricks.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/green/green_bricks", + "particle": "new_soviet:block/green/green_bricks" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/green_bricks_2.json b/src/main/resources/assets/new_soviet/models/block/green_bricks_2.json new file mode 100644 index 0000000..a745589 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/green_bricks_2.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/green/green_bricks_with_any", + "particle": "new_soviet:block/green/green_bricks_with_any" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/green_wallpaper.json b/src/main/resources/assets/new_soviet/models/block/green_wallpaper.json new file mode 100644 index 0000000..d7b2e0b --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/green_wallpaper.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/wallpapers/green_wallpaper", + "particle": "new_soviet:block/wallpapers/green_wallpaper" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/light_bulb_broken.json b/src/main/resources/assets/new_soviet/models/block/light_bulb_broken.json index c8094ae..80b3a3a 100644 --- a/src/main/resources/assets/new_soviet/models/block/light_bulb_broken.json +++ b/src/main/resources/assets/new_soviet/models/block/light_bulb_broken.json @@ -6,7 +6,7 @@ }, "elements": [ { - "from": [7, 6, 7], + "from": [7, 8, 7], "to": [9, 8, 9], "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, "faces": { @@ -15,31 +15,83 @@ "south": {"uv": [7, 0, 5, 2], "texture": "#0"}, "west": {"uv": [5, 0, 7, 2], "texture": "#0"}, "up": {"uv": [7, 4, 5, 2], "texture": "#0"}, - "down": {"uv": [16, 14, 14, 16], "texture": "#0"} + "down": {"uv": [7, 2, 5, 4], "texture": "#0"} } }, { - "from": [8, 5, 7.5], + "from": [7, 6, 7], + "to": [7, 8, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [7, 0, 5, 2], "texture": "#0"}, + "east": {"uv": [7, 0, 5, 2], "texture": "#0"}, + "south": {"uv": [7, 0, 5, 2], "texture": "#0"}, + "west": {"uv": [5, 0, 7, 2], "texture": "#0"}, + "up": {"uv": [7, 2, 5, 0], "texture": "#0"}, + "down": {"uv": [7, 2, 5, 4], "texture": "#0"} + } + }, + { + "from": [9, 6, 7], + "to": [9, 8, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [7, 0, 5, 2], "texture": "#0"}, + "east": {"uv": [5, 0, 7, 2], "texture": "#0"}, + "south": {"uv": [7, 0, 5, 2], "texture": "#0"}, + "west": {"uv": [7, 0, 5, 2], "texture": "#0"}, + "up": {"uv": [7, 2, 5, 0], "texture": "#0"}, + "down": {"uv": [7, 2, 5, 4], "texture": "#0"} + } + }, + { + "from": [7, 6, 9], + "to": [9, 8, 9], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [5, 0, 7, 2], "texture": "#0"}, + "east": {"uv": [5, 0, 7, 2], "texture": "#0"}, + "south": {"uv": [7, 0, 5, 2], "texture": "#0"}, + "west": {"uv": [7, 0, 5, 2], "texture": "#0"}, + "up": {"uv": [7, 2, 5, 0], "texture": "#0"}, + "down": {"uv": [7, 2, 5, 4], "texture": "#0"} + } + }, + { + "from": [7, 6, 7], + "to": [9, 8, 7], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [7, 0, 5, 2], "texture": "#0"}, + "east": {"uv": [5, 0, 7, 2], "texture": "#0"}, + "south": {"uv": [5, 0, 7, 2], "texture": "#0"}, + "west": {"uv": [7, 0, 5, 2], "texture": "#0"}, + "up": {"uv": [7, 2, 5, 0], "texture": "#0"}, + "down": {"uv": [7, 2, 5, 4], "texture": "#0"} + } + }, + { + "from": [8, 8, 7.5], "to": [8, 16, 8.5], "rotation": {"angle": -45, "axis": "y", "origin": [8, 0, 8]}, "faces": { "north": {"uv": [0, 0, 0, 11], "texture": "#0"}, - "east": {"uv": [0, 0, 1, 11], "texture": "#0"}, + "east": {"uv": [0, 0, 1, 8], "texture": "#0"}, "south": {"uv": [0, 0, 0, 11], "texture": "#0"}, - "west": {"uv": [0, 0, 1, 11], "texture": "#0"}, + "west": {"uv": [0, 0, 1, 8], "texture": "#0"}, "up": {"uv": [0, 0, 0, 1], "texture": "#0"}, "down": {"uv": [0, 0, 0, 1], "texture": "#0"} } }, { - "from": [8, 5, 7.5], + "from": [8, 8, 7.5], "to": [8, 16, 8.5], "rotation": {"angle": 45, "axis": "y", "origin": [8, 0, 8]}, "faces": { "north": {"uv": [0, 0, 0, 11], "texture": "#0"}, - "east": {"uv": [1, 0, 2, 11], "texture": "#0"}, + "east": {"uv": [1, 0, 2, 8], "texture": "#0"}, "south": {"uv": [0, 0, 0, 11], "texture": "#0"}, - "west": {"uv": [1, 0, 2, 11], "texture": "#0"}, + "west": {"uv": [1, 0, 2, 8], "texture": "#0"}, "up": {"uv": [0, 1, 0, 0], "texture": "#0"}, "down": {"uv": [0, 0, 0, 1], "texture": "#0"} } @@ -53,23 +105,9 @@ "east": {"uv": [7, 0, 9, 1], "texture": "#0"}, "south": {"uv": [9, 0, 7, 1], "texture": "#0"}, "west": {"uv": [7, 0, 9, 1], "texture": "#0"}, - "up": {"uv": [16, 16, 14, 14], "texture": "#0"}, + "up": {"uv": [5, 11, 3, 9], "texture": "#0"}, "down": {"uv": [5, 9, 3, 11], "texture": "#0"} } - }, - { - "name": "cube_outline", - "from": [9, 8, 9], - "to": [7, 6, 7], - "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, - "faces": { - "north": {"uv": [7, 0, 5, 2], "rotation": 180, "texture": "#0"}, - "east": {"uv": [5, 0, 7, 2], "rotation": 180, "texture": "#0"}, - "south": {"uv": [7, 0, 5, 2], "rotation": 180, "texture": "#0"}, - "west": {"uv": [5, 0, 7, 2], "rotation": 180, "texture": "#0"}, - "up": {"uv": [16, 14, 14, 16], "rotation": 180, "texture": "#0"}, - "down": {"uv": [7, 4, 5, 2], "rotation": 180, "texture": "#0"} - } } ], "groups": [ @@ -78,7 +116,7 @@ "origin": [16, 8, 16], "color": 0, "nbt": "{}", - "children": [0, 1, 2, 3, 4] + "children": [0, 1, 2, 3, 4, 5, 6, 7] } ] } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/light_bulb_on.json b/src/main/resources/assets/new_soviet/models/block/light_bulb_on.json index ecf0fe1..cff42a3 100644 --- a/src/main/resources/assets/new_soviet/models/block/light_bulb_on.json +++ b/src/main/resources/assets/new_soviet/models/block/light_bulb_on.json @@ -66,11 +66,47 @@ "east": {"uv": [7, 0, 9, 1], "texture": "#0"}, "south": {"uv": [9, 0, 7, 1], "texture": "#0"}, "west": {"uv": [7, 0, 9, 1], "texture": "#0"}, - "up": {"uv": [16, 16, 14, 14], "texture": "#0"}, + "up": {"uv": [5, 11, 3, 9], "texture": "#0"}, "down": {"uv": [5, 9, 3, 11], "texture": "#0"} } } ], + "display": { + "thirdperson_righthand": { + "rotation": [180, 0, 0], + "scale": [0.7, 0.7, 0.7] + }, + "thirdperson_lefthand": { + "rotation": [180, 0, 0], + "scale": [0.7, 0.7, 0.7] + }, + "firstperson_righthand": { + "rotation": [180, 0, 0], + "translation": [2.25, 0, 0] + }, + "firstperson_lefthand": { + "rotation": [180, 0, 0], + "translation": [2.25, 0, 0] + }, + "ground": { + "rotation": [180, 0, 90], + "translation": [0, -1.75, 0], + "scale": [0.7, 0.7, 0.7] + }, + "gui": { + "rotation": [30, 225, 0], + "translation": [0, -1.25, 0], + "scale": [1.1, 1.1, 1.1] + }, + "head": { + "scale": [0, 0, 0] + }, + "fixed": { + "rotation": [180, 0, 0], + "translation": [0, 2.25, 0], + "scale": [1.2, 1.2, 1.2] + } + }, "groups": [ { "name": "group", diff --git a/src/main/resources/assets/new_soviet/models/block/meat_1.json b/src/main/resources/assets/new_soviet/models/block/meat_1.json new file mode 100644 index 0000000..b9e9bd2 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/meat_1.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/meat/meat", + "particle": "new_soviet:block/meat/meat" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/meat_2.json b/src/main/resources/assets/new_soviet/models/block/meat_2.json new file mode 100644 index 0000000..9f77014 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/meat_2.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/meat/meat2", + "particle": "new_soviet:block/meat/meat2" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/meat_3.json b/src/main/resources/assets/new_soviet/models/block/meat_3.json new file mode 100644 index 0000000..b6ffea9 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/meat_3.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/meat/meat3", + "particle": "new_soviet:block/meat/meat3" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/meat_eye.json b/src/main/resources/assets/new_soviet/models/block/meat_eye.json new file mode 100644 index 0000000..c72c72b --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/meat_eye.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/meat/meat_eye", + "particle": "new_soviet:block/meat/meat" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/meat_teeth.json b/src/main/resources/assets/new_soviet/models/block/meat_teeth.json new file mode 100644 index 0000000..bff691b --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/meat_teeth.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/meat/meat_teeth", + "particle": "new_soviet:block/meat/meat" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/mossy_brick_tiles.json b/src/main/resources/assets/new_soviet/models/block/mossy_brick_tiles.json new file mode 100644 index 0000000..b713511 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/mossy_brick_tiles.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/brown/mossy_brown_tiles", + "particle": "new_soviet:block/brown/mossy_brown_tiles" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/mossy_dark_brick_tiles.json b/src/main/resources/assets/new_soviet/models/block/mossy_dark_brick_tiles.json new file mode 100644 index 0000000..0acdb96 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/mossy_dark_brick_tiles.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/brown/mossy_dark_brown_tiles", + "particle": "new_soviet:block/brown/mossy_dark_brown_tiles" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/mossy_green_bricks.json b/src/main/resources/assets/new_soviet/models/block/mossy_green_bricks.json new file mode 100644 index 0000000..28b99ac --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/mossy_green_bricks.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/green/mossy_green_bricks", + "particle": "new_soviet:block/green/mossy_green_bricks" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/mossy_green_bricks_2.json b/src/main/resources/assets/new_soviet/models/block/mossy_green_bricks_2.json new file mode 100644 index 0000000..79f564a --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/mossy_green_bricks_2.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/green/mossy_green_bricks_with_any", + "particle": "new_soviet:block/green/mossy_green_bricks_with_any" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/mossy_red_bricks.json b/src/main/resources/assets/new_soviet/models/block/mossy_red_bricks.json new file mode 100644 index 0000000..ba6caa1 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/mossy_red_bricks.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/red/mossy_red_bricks", + "particle": "new_soviet:block/red/mossy_red_bricks" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/nii_floor.json b/src/main/resources/assets/new_soviet/models/block/nii_floor.json new file mode 100644 index 0000000..c287156 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/nii_floor.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/research_institute/nii_floor", + "particle": "new_soviet:block/research_institute/nii_floor" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/nii_wall_1.json b/src/main/resources/assets/new_soviet/models/block/nii_wall_1.json new file mode 100644 index 0000000..52d519c --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/nii_wall_1.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/research_institute/nii_wall_1", + "particle": "new_soviet:block/research_institute/nii_wall_1" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/nii_wall_2.json b/src/main/resources/assets/new_soviet/models/block/nii_wall_2.json new file mode 100644 index 0000000..3b2a4f8 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/nii_wall_2.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/research_institute/nii_wall2", + "particle": "new_soviet:block/research_institute/nii_wall2" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/nii_wall_3.json b/src/main/resources/assets/new_soviet/models/block/nii_wall_3.json new file mode 100644 index 0000000..24ef7ca --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/nii_wall_3.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/research_institute/nii_wall3", + "particle": "new_soviet:block/research_institute/nii_wall3" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/purple_goo_1.json b/src/main/resources/assets/new_soviet/models/block/purple_goo_1.json new file mode 100644 index 0000000..0748dc0 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/purple_goo_1.json @@ -0,0 +1,30 @@ +{ + "credit": "Made by Feulim (karoter2)", + "textures": { + "0": "new_soviet:block/purple_goo/purple_goo", + "particle": "new_soviet:block/purple_goo/purple_goo" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 2, 16], + "faces": { + "north": {"uv": [0, 2, 16, 0], "rotation": 180, "texture": "#0"}, + "east": {"uv": [16, 0, 14, 16], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 16, 16, 14], "texture": "#0"}, + "west": {"uv": [2, 0, 0, 16], "rotation": 270, "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "group", + "origin": [8, 8, 8], + "color": 0, + "nbt": "{}", + "children": [0] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/purple_goo_2.json b/src/main/resources/assets/new_soviet/models/block/purple_goo_2.json new file mode 100644 index 0000000..c4e0d78 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/purple_goo_2.json @@ -0,0 +1,30 @@ +{ + "credit": "Made by Feulim (karoter2)", + "textures": { + "0": "new_soviet:block/purple_goo/purple_goo", + "particle": "new_soviet:block/purple_goo/purple_goo" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 4, 16], + "faces": { + "north": {"uv": [0, 4, 16, 0], "rotation": 180, "texture": "#0"}, + "east": {"uv": [16, 0, 12, 16], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 16, 16, 12], "texture": "#0"}, + "west": {"uv": [4, 0, 0, 16], "rotation": 270, "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "group", + "origin": [8, 8, 8], + "color": 0, + "nbt": "{}", + "children": [0] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/purple_goo_3.json b/src/main/resources/assets/new_soviet/models/block/purple_goo_3.json new file mode 100644 index 0000000..41b1ea5 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/purple_goo_3.json @@ -0,0 +1,30 @@ +{ + "credit": "Made by Feulim (karoter2)", + "textures": { + "0": "new_soviet:block/purple_goo/purple_goo", + "particle": "new_soviet:block/purple_goo/purple_goo" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 6, 16], + "faces": { + "north": {"uv": [0, 6, 16, 0], "rotation": 180, "texture": "#0"}, + "east": {"uv": [16, 0, 10, 16], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 16, 16, 10], "texture": "#0"}, + "west": {"uv": [6, 0, 0, 16], "rotation": 270, "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "group", + "origin": [8, 8, 8], + "color": 0, + "nbt": "{}", + "children": [0] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/purple_goo_4.json b/src/main/resources/assets/new_soviet/models/block/purple_goo_4.json new file mode 100644 index 0000000..a228403 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/purple_goo_4.json @@ -0,0 +1,30 @@ +{ + "credit": "Made by Feulim (karoter2)", + "textures": { + "0": "new_soviet:block/purple_goo/purple_goo", + "particle": "new_soviet:block/purple_goo/purple_goo" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 8, 16], + "faces": { + "north": {"uv": [0, 8, 16, 0], "rotation": 180, "texture": "#0"}, + "east": {"uv": [16, 0, 8, 16], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 16, 16, 8], "texture": "#0"}, + "west": {"uv": [8, 0, 0, 16], "rotation": 270, "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "group", + "origin": [8, 8, 8], + "color": 0, + "nbt": "{}", + "children": [0] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/purple_goo_5.json b/src/main/resources/assets/new_soviet/models/block/purple_goo_5.json new file mode 100644 index 0000000..6156664 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/purple_goo_5.json @@ -0,0 +1,30 @@ +{ + "credit": "Made by Feulim (karoter2)", + "textures": { + "0": "new_soviet:block/purple_goo/purple_goo", + "particle": "new_soviet:block/purple_goo/purple_goo" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 10, 16], + "faces": { + "north": {"uv": [0, 10, 16, 0], "rotation": 180, "texture": "#0"}, + "east": {"uv": [16, 0, 6, 16], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 16, 16, 6], "texture": "#0"}, + "west": {"uv": [10, 0, 0, 16], "rotation": 270, "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "group", + "origin": [8, 8, 8], + "color": 0, + "nbt": "{}", + "children": [0] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/purple_goo_6.json b/src/main/resources/assets/new_soviet/models/block/purple_goo_6.json new file mode 100644 index 0000000..70f5dd0 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/purple_goo_6.json @@ -0,0 +1,30 @@ +{ + "credit": "Made by Feulim (karoter2)", + "textures": { + "0": "new_soviet:block/purple_goo/purple_goo", + "particle": "new_soviet:block/purple_goo/purple_goo" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 12, 16], + "faces": { + "north": {"uv": [0, 12, 16, 0], "rotation": 180, "texture": "#0"}, + "east": {"uv": [16, 0, 4, 16], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 16, 16, 4], "texture": "#0"}, + "west": {"uv": [12, 0, 0, 16], "rotation": 270, "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "group", + "origin": [8, 8, 8], + "color": 0, + "nbt": "{}", + "children": [0] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/purple_goo_7.json b/src/main/resources/assets/new_soviet/models/block/purple_goo_7.json new file mode 100644 index 0000000..7947b03 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/purple_goo_7.json @@ -0,0 +1,30 @@ +{ + "credit": "Made by Feulim (karoter2)", + "textures": { + "0": "new_soviet:block/purple_goo/purple_goo", + "particle": "new_soviet:block/purple_goo/purple_goo" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 14, 16], + "faces": { + "north": {"uv": [0, 14, 16, 0], "rotation": 180, "texture": "#0"}, + "east": {"uv": [16, 0, 2, 16], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 16, 16, 2], "texture": "#0"}, + "west": {"uv": [14, 0, 0, 16], "rotation": 270, "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "group", + "origin": [8, 8, 8], + "color": 0, + "nbt": "{}", + "children": [0] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/purple_goo_8.json b/src/main/resources/assets/new_soviet/models/block/purple_goo_8.json new file mode 100644 index 0000000..6dc25d2 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/purple_goo_8.json @@ -0,0 +1,30 @@ +{ + "credit": "Made by Feulim (karoter2)", + "textures": { + "0": "new_soviet:block/purple_goo/purple_goo", + "particle": "new_soviet:block/purple_goo/purple_goo" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [0, 16, 16, 0], "rotation": 180, "texture": "#0"}, + "east": {"uv": [16, 0, 0, 16], "rotation": 90, "texture": "#0"}, + "south": {"uv": [0, 16, 16, 0], "texture": "#0"}, + "west": {"uv": [16, 0, 0, 16], "rotation": 270, "texture": "#0"}, + "up": {"uv": [0, 0, 16, 16], "texture": "#0"}, + "down": {"uv": [0, 0, 16, 16], "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "group", + "origin": [8, 8, 8], + "color": 0, + "nbt": "{}", + "children": [0] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/radio.json b/src/main/resources/assets/new_soviet/models/block/radio.json index fe9be42..5fb0d5e 100644 --- a/src/main/resources/assets/new_soviet/models/block/radio.json +++ b/src/main/resources/assets/new_soviet/models/block/radio.json @@ -3,7 +3,7 @@ "texture_size": [64, 64], "textures": { "0": "new_soviet:block/custom/electronics/radio", - "particle": "new_soviet:block/custom/electronics/radio" + "particle": "new_soviet:block/custom/electronics/radio_particle" }, "elements": [ { diff --git a/src/main/resources/assets/new_soviet/models/block/red_bricks.json b/src/main/resources/assets/new_soviet/models/block/red_bricks.json new file mode 100644 index 0000000..82bf01c --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/red_bricks.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/red/red_bricks", + "particle": "new_soviet:block/red/red_bricks" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/red_tv.json b/src/main/resources/assets/new_soviet/models/block/red_tv.json index 5a23cf3..917995f 100644 --- a/src/main/resources/assets/new_soviet/models/block/red_tv.json +++ b/src/main/resources/assets/new_soviet/models/block/red_tv.json @@ -2,6 +2,6 @@ "parent": "new_soviet:block/tv", "textures": { "0": "new_soviet:block/custom/electronics/red_television", - "particle": "new_soviet:block/custom/electronics/red_television" + "particle": "new_soviet:block/custom/electronics/red_television_particle" } } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/small_cracked_yellow_tiles.json b/src/main/resources/assets/new_soviet/models/block/small_cracked_yellow_tiles.json new file mode 100644 index 0000000..39f87f2 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/small_cracked_yellow_tiles.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/yellow/small_cracked_yellow_tiles", + "particle": "new_soviet:block/yellow/small_cracked_yellow_tiles" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/small_yellow_tiles.json b/src/main/resources/assets/new_soviet/models/block/small_yellow_tiles.json new file mode 100644 index 0000000..f87ea2b --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/small_yellow_tiles.json @@ -0,0 +1,9 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/yellow/small_yellow_tiles", + "particle": "new_soviet:block/yellow/small_yellow_tiles" + + } +} + diff --git a/src/main/resources/assets/new_soviet/models/block/switch_type_1_off.json b/src/main/resources/assets/new_soviet/models/block/switch_type_1_off.json new file mode 100644 index 0000000..857b776 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/switch_type_1_off.json @@ -0,0 +1,86 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "new_soviet:block/custom/switches/switch_type_1", + "particle": "new_soviet:block/custom/switches/switch_type_1" + }, + "elements": [ + { + "from": [7.502, 0.45, 7], + "to": [8.502, 1.45, 9], + "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 1.45, 8]}, + "faces": { + "north": {"uv": [8, 5, 7, 6], "rotation": 180, "texture": "#0"}, + "east": {"uv": [6, 4, 7, 6], "rotation": 270, "texture": "#0"}, + "south": {"uv": [8, 5, 7, 4], "texture": "#0"}, + "west": {"uv": [7, 2, 8, 4], "rotation": 90, "texture": "#0"}, + "up": {"uv": [6, 2, 7, 4], "rotation": 180, "texture": "#0"}, + "down": {"uv": [6, 6, 7, 8], "texture": "#0"} + } + }, + { + "from": [7.5, 0.45, 7], + "to": [8.5, 1.45, 8], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [9, 5, 8, 6], "rotation": 180, "texture": "#0"}, + "east": {"uv": [7, 7, 8, 8], "rotation": 270, "texture": "#0"}, + "south": {"uv": [9, 5, 8, 4], "texture": "#0"}, + "west": {"uv": [8, 3, 9, 4], "rotation": 90, "texture": "#0"}, + "up": {"uv": [7, 6, 8, 7], "rotation": 180, "texture": "#0"}, + "down": {"uv": [8, 2, 9, 3], "texture": "#0"} + } + }, + { + "from": [5.5, 0, 5.5], + "to": [10.5, 1, 10.5], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [11, 1, 6, 2], "rotation": 180, "texture": "#0"}, + "east": {"uv": [5, 0, 6, 5], "rotation": 270, "texture": "#0"}, + "south": {"uv": [11, 1, 6, 0], "texture": "#0"}, + "west": {"uv": [5, 5, 6, 10], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 0, 5, 5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 5, 5, 10], "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "translation": [0, 8, 0] + }, + "thirdperson_lefthand": { + "translation": [0, 8, 0] + }, + "firstperson_righthand": { + "rotation": [90, 180, 0], + "translation": [2, 2.25, 8.5] + }, + "firstperson_lefthand": { + "rotation": [90, 180, 0], + "translation": [2, 2.25, 8.5] + }, + "ground": { + "translation": [0, 5, 0] + }, + "gui": { + "rotation": [30, 225, 0], + "translation": [0, 10.5, 0], + "scale": [2, 2, 2] + }, + "fixed": { + "rotation": [-90, 0, 0], + "translation": [0, 0, -14.75], + "scale": [2, 2, 2] + } + }, + "groups": [ + { + "name": "group", + "origin": [0, 0, 0], + "color": 0, + "nbt": "{}", + "children": [0, 1, 2] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/switch_type_1_on.json b/src/main/resources/assets/new_soviet/models/block/switch_type_1_on.json new file mode 100644 index 0000000..1ec0852 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/switch_type_1_on.json @@ -0,0 +1,57 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "new_soviet:block/custom/switches/switch_type_1", + "particle": "new_soviet:block/custom/switches/switch_type_1" + }, + "elements": [ + { + "from": [7.502, 0.45, 7], + "to": [8.502, 1.45, 9], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [8, 5, 7, 6], "rotation": 180, "texture": "#0"}, + "east": {"uv": [6, 4, 7, 6], "rotation": 270, "texture": "#0"}, + "south": {"uv": [8, 5, 7, 4], "texture": "#0"}, + "west": {"uv": [7, 2, 8, 4], "rotation": 90, "texture": "#0"}, + "up": {"uv": [6, 2, 7, 4], "rotation": 180, "texture": "#0"}, + "down": {"uv": [6, 6, 7, 8], "texture": "#0"} + } + }, + { + "from": [7.5, 0.45, 7], + "to": [8.5, 1.45, 8], + "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 1.45, 8]}, + "faces": { + "north": {"uv": [9, 5, 8, 6], "rotation": 180, "texture": "#0"}, + "east": {"uv": [7, 7, 8, 8], "rotation": 270, "texture": "#0"}, + "south": {"uv": [9, 5, 8, 4], "texture": "#0"}, + "west": {"uv": [8, 3, 9, 4], "rotation": 90, "texture": "#0"}, + "up": {"uv": [7, 6, 8, 7], "rotation": 180, "texture": "#0"}, + "down": {"uv": [8, 2, 9, 3], "texture": "#0"} + } + }, + { + "from": [5.5, 0, 5.5], + "to": [10.5, 1, 10.5], + "rotation": {"angle": 0, "axis": "x", "origin": [8, 8, 8]}, + "faces": { + "north": {"uv": [11, 1, 6, 2], "rotation": 180, "texture": "#0"}, + "east": {"uv": [5, 0, 6, 5], "rotation": 270, "texture": "#0"}, + "south": {"uv": [11, 1, 6, 0], "texture": "#0"}, + "west": {"uv": [5, 5, 6, 10], "rotation": 90, "texture": "#0"}, + "up": {"uv": [0, 0, 5, 5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [0, 5, 5, 10], "texture": "#0"} + } + } + ], + "groups": [ + { + "name": "group", + "origin": [0, 0, 0], + "color": 0, + "nbt": "{}", + "children": [0, 1, 2] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/table_lamp.json b/src/main/resources/assets/new_soviet/models/block/table_lamp.json index 277eb5d..e2ec72a 100644 --- a/src/main/resources/assets/new_soviet/models/block/table_lamp.json +++ b/src/main/resources/assets/new_soviet/models/block/table_lamp.json @@ -4,7 +4,7 @@ "texture_size": [64, 64], "textures": { "2": "new_soviet:block/custom/furniture/table_lamp", - "particle": "new_soviet:block/custom/furniture/table_lamp" + "particle": "new_soviet:block/custom/furniture/table_lamp_particle" }, "elements": [ { diff --git a/src/main/resources/assets/new_soviet/models/block/tv.json b/src/main/resources/assets/new_soviet/models/block/tv.json index 062f0c9..3967938 100644 --- a/src/main/resources/assets/new_soviet/models/block/tv.json +++ b/src/main/resources/assets/new_soviet/models/block/tv.json @@ -3,7 +3,7 @@ "texture_size": [64, 64], "textures": { "0": "new_soviet:block/custom/electronics/television", - "particle": "new_soviet:block/custom/electronics/television" + "particle": "new_soviet:block/custom/electronics/television_particle" }, "elements": [ { diff --git a/src/main/resources/assets/new_soviet/models/block/variated_light_blue_tiles.json b/src/main/resources/assets/new_soviet/models/block/variated_light_blue_tiles.json new file mode 100644 index 0000000..1c49917 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/variated_light_blue_tiles.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "new_soviet:block/light_blue/variated_light_blue_tiles", + "particle": "new_soviet:block/light_blue/variated_light_blue_tiles" + } +} + diff --git a/src/main/resources/assets/new_soviet/models/item/beige_wallpaper.json b/src/main/resources/assets/new_soviet/models/item/beige_wallpaper.json new file mode 100644 index 0000000..7bc5b85 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/beige_wallpaper.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/beige_wallpaper" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/big_green_tiles.json b/src/main/resources/assets/new_soviet/models/item/big_green_tiles.json new file mode 100644 index 0000000..117e8ee --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/big_green_tiles.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/big_green_tiles" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/big_green_tiles_cracked.json b/src/main/resources/assets/new_soviet/models/item/big_green_tiles_cracked.json new file mode 100644 index 0000000..a756c39 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/big_green_tiles_cracked.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/big_green_tiles_cracked_1" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/brick_tiles.json b/src/main/resources/assets/new_soviet/models/item/brick_tiles.json new file mode 100644 index 0000000..f9dcad2 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/brick_tiles.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/brick_tiles" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/brown_wallpaper.json b/src/main/resources/assets/new_soviet/models/item/brown_wallpaper.json new file mode 100644 index 0000000..fd1f83c --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/brown_wallpaper.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/brown_wallpaper" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/concentrate.json b/src/main/resources/assets/new_soviet/models/item/concentrate.json new file mode 100644 index 0000000..e4d59f2 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/concentrate.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "new_soviet:item/concentrate" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/cracked_brick_tiles.json b/src/main/resources/assets/new_soviet/models/item/cracked_brick_tiles.json new file mode 100644 index 0000000..ea4ec5e --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/cracked_brick_tiles.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/cracked_brick_tiles" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/cracked_dark_brick_tiles.json b/src/main/resources/assets/new_soviet/models/item/cracked_dark_brick_tiles.json new file mode 100644 index 0000000..26a3187 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/cracked_dark_brick_tiles.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/cracked_dark_brick_tiles" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/cracked_glazed_brick_tiles.json b/src/main/resources/assets/new_soviet/models/item/cracked_glazed_brick_tiles.json new file mode 100644 index 0000000..ff3f063 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/cracked_glazed_brick_tiles.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/cracked_glazed_brick_tiles" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/cracked_green_bricks.json b/src/main/resources/assets/new_soviet/models/item/cracked_green_bricks.json new file mode 100644 index 0000000..bb96e6e --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/cracked_green_bricks.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/cracked_green_bricks" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/cracked_green_bricks_2.json b/src/main/resources/assets/new_soviet/models/item/cracked_green_bricks_2.json new file mode 100644 index 0000000..ee62ddc --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/cracked_green_bricks_2.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/cracked_green_bricks_2" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/cracked_nii_wall_1.json b/src/main/resources/assets/new_soviet/models/item/cracked_nii_wall_1.json new file mode 100644 index 0000000..7b9786d --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/cracked_nii_wall_1.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/cracked_nii_wall_1" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/cracked_red_bricks.json b/src/main/resources/assets/new_soviet/models/item/cracked_red_bricks.json new file mode 100644 index 0000000..ab6cf7a --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/cracked_red_bricks.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/cracked_red_bricks" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/dark_brick_tiles.json b/src/main/resources/assets/new_soviet/models/item/dark_brick_tiles.json new file mode 100644 index 0000000..0653014 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/dark_brick_tiles.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/dark_brick_tiles" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/dirty_brick_tiles.json b/src/main/resources/assets/new_soviet/models/item/dirty_brick_tiles.json new file mode 100644 index 0000000..18ea7ce --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/dirty_brick_tiles.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/dirty_brick_tiles" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/dirty_dark_brick_tiles.json b/src/main/resources/assets/new_soviet/models/item/dirty_dark_brick_tiles.json new file mode 100644 index 0000000..5a2ec63 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/dirty_dark_brick_tiles.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/dirty_dark_brick_tiles" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/glazed_brick_tiles.json b/src/main/resources/assets/new_soviet/models/item/glazed_brick_tiles.json new file mode 100644 index 0000000..5beb5bb --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/glazed_brick_tiles.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/glazed_brick_tiles" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/green_bricks.json b/src/main/resources/assets/new_soviet/models/item/green_bricks.json new file mode 100644 index 0000000..39f6ca3 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/green_bricks.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/green_bricks" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/green_bricks_2.json b/src/main/resources/assets/new_soviet/models/item/green_bricks_2.json new file mode 100644 index 0000000..7f4fca2 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/green_bricks_2.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/green_bricks_2" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/green_wallpaper.json b/src/main/resources/assets/new_soviet/models/item/green_wallpaper.json new file mode 100644 index 0000000..33b3380 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/green_wallpaper.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/green_wallpaper" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/meat.json b/src/main/resources/assets/new_soviet/models/item/meat.json new file mode 100644 index 0000000..2e688b8 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/meat.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/meat_1" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/meat_eye.json b/src/main/resources/assets/new_soviet/models/item/meat_eye.json new file mode 100644 index 0000000..828c77f --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/meat_eye.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/meat_eye" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/meat_teeth.json b/src/main/resources/assets/new_soviet/models/item/meat_teeth.json new file mode 100644 index 0000000..1c5144a --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/meat_teeth.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/meat_teeth" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/mossy_brick_tiles.json b/src/main/resources/assets/new_soviet/models/item/mossy_brick_tiles.json new file mode 100644 index 0000000..9b1097f --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/mossy_brick_tiles.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/mossy_brick_tiles" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/mossy_dark_brick_tiles.json b/src/main/resources/assets/new_soviet/models/item/mossy_dark_brick_tiles.json new file mode 100644 index 0000000..ee21e2b --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/mossy_dark_brick_tiles.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/mossy_dark_brick_tiles" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/mossy_green_bricks.json b/src/main/resources/assets/new_soviet/models/item/mossy_green_bricks.json new file mode 100644 index 0000000..285689f --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/mossy_green_bricks.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/mossy_green_bricks" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/mossy_green_bricks_2.json b/src/main/resources/assets/new_soviet/models/item/mossy_green_bricks_2.json new file mode 100644 index 0000000..7b94511 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/mossy_green_bricks_2.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/mossy_green_bricks_2" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/mossy_red_bricks.json b/src/main/resources/assets/new_soviet/models/item/mossy_red_bricks.json new file mode 100644 index 0000000..0d8b087 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/mossy_red_bricks.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/mossy_red_bricks" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/nii_floor.json b/src/main/resources/assets/new_soviet/models/item/nii_floor.json new file mode 100644 index 0000000..708cef5 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/nii_floor.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/nii_floor" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/nii_wall_1.json b/src/main/resources/assets/new_soviet/models/item/nii_wall_1.json new file mode 100644 index 0000000..afeafc6 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/nii_wall_1.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/nii_wall_1" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/nii_wall_2.json b/src/main/resources/assets/new_soviet/models/item/nii_wall_2.json new file mode 100644 index 0000000..fe154fc --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/nii_wall_2.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/nii_wall_2" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/nii_wall_3.json b/src/main/resources/assets/new_soviet/models/item/nii_wall_3.json new file mode 100644 index 0000000..fd29116 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/nii_wall_3.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/nii_wall_3" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/purple_goo.json b/src/main/resources/assets/new_soviet/models/item/purple_goo.json new file mode 100644 index 0000000..6d12260 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/purple_goo.json @@ -0,0 +1,7 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "new_soviet:item/purple_goo_item" + } +} + diff --git a/src/main/resources/assets/new_soviet/models/item/rake.json b/src/main/resources/assets/new_soviet/models/item/rake.json new file mode 100644 index 0000000..caad4ea --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/rake.json @@ -0,0 +1,94 @@ +{ + "credit": "Made by Feulim (karoter2)", + "texture_size": [64, 64], + "textures": { + "0": "new_soviet:item/rake", + "particle": "new_soviet:item/rake" + }, + "elements": [ + { + "from": [7.5, 0, 0], + "to": [8.5, 1, 28], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [3.75, 3.5, 4, 3.75], "texture": "#0"}, + "east": {"uv": [3.25, 1.5, 10.25, 1.75], "texture": "#0"}, + "south": {"uv": [3.75, 3.75, 4, 4], "texture": "#0"}, + "west": {"uv": [3.25, 1.75, 10.25, 2], "texture": "#0"}, + "up": {"uv": [3.5, 2, 3.25, 9], "texture": "#0"}, + "down": {"uv": [3.75, 2, 3.5, 9], "texture": "#0"} + } + }, + { + "from": [1.5, -2, 0], + "to": [14.5, 1, 10], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [3.25, 0, 6.5, 0.75], "texture": "#0"}, + "east": {"uv": [3.75, 2, 6.25, 2.75], "texture": "#0"}, + "south": {"uv": [3.25, 0.75, 6.5, 1.5], "texture": "#0"}, + "west": {"uv": [3.75, 2.75, 6.25, 3.5], "texture": "#0"}, + "up": {"uv": [3.25, 2.5, 0, 0], "texture": "#0"}, + "down": {"uv": [0, 5, 3.25, 2.5], "texture": "#0"} + } + }, + { + "name": "cube_outline", + "from": [14.5, 1, 10], + "to": [1.5, -2, 0], + "rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]}, + "faces": { + "north": {"uv": [3.25, 0.75, 6.5, 1.5], "rotation": 180, "texture": "#0"}, + "east": {"uv": [3.75, 2.75, 6.25, 3.5], "rotation": 180, "texture": "#0"}, + "south": {"uv": [6.5, 0, 3.25, 0.75], "rotation": 180, "texture": "#0"}, + "west": {"uv": [3.75, 2, 6.25, 2.75], "rotation": 180, "texture": "#0"}, + "up": {"uv": [3.25, 2.5, 0, 5], "rotation": 180, "texture": "#0"}, + "down": {"uv": [3.25, 0, 0, 2.5], "rotation": 180, "texture": "#0"} + } + } + ], + "display": { + "thirdperson_righthand": { + "rotation": [90, 0, -28], + "translation": [3.5, 8, 8] + }, + "thirdperson_lefthand": { + "rotation": [90, 0, -28], + "translation": [3.5, 8, 8] + }, + "firstperson_righthand": { + "rotation": [45, 0, -15], + "translation": [5.5, 5.5, 0] + }, + "firstperson_lefthand": { + "rotation": [45, 0, -15], + "translation": [5.5, 5.5, 0] + }, + "ground": { + "translation": [0, 2, 0], + "scale": [0.5, 0.5, 0.5] + }, + "gui": { + "rotation": [90, -45, -180], + "translation": [1.25, 1.25, 0], + "scale": [0.63, 0.63, 0.63] + }, + "head": { + "scale": [0, 0, 0] + }, + "fixed": { + "rotation": [90, 0, 0], + "translation": [0, 4, 5.5], + "scale": [0.65, 0.65, 0.65] + } + }, + "groups": [ + { + "name": "group", + "origin": [15, 8, 15], + "color": 0, + "nbt": "{}", + "children": [0, 1, 2] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/red_bricks.json b/src/main/resources/assets/new_soviet/models/item/red_bricks.json new file mode 100644 index 0000000..624c273 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/red_bricks.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/red_bricks" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/small_cracked_yellow_tiles.json b/src/main/resources/assets/new_soviet/models/item/small_cracked_yellow_tiles.json new file mode 100644 index 0000000..0a050c2 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/small_cracked_yellow_tiles.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/small_cracked_yellow_tiles" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/small_yellow_tiles.json b/src/main/resources/assets/new_soviet/models/item/small_yellow_tiles.json new file mode 100644 index 0000000..ed74817 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/small_yellow_tiles.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/small_yellow_tiles" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/switch.json b/src/main/resources/assets/new_soviet/models/item/switch.json new file mode 100644 index 0000000..4a07dd5 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/switch.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/switch_type_1_off" +} + diff --git a/src/main/resources/assets/new_soviet/models/item/variated_light_blue_tiles.json b/src/main/resources/assets/new_soviet/models/item/variated_light_blue_tiles.json new file mode 100644 index 0000000..44c8a93 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/variated_light_blue_tiles.json @@ -0,0 +1,4 @@ +{ + "parent": "new_soviet:block/variated_light_blue_tiles" +} + diff --git a/src/main/resources/assets/new_soviet/sounds.json b/src/main/resources/assets/new_soviet/sounds.json index acf1342..f830bf7 100644 --- a/src/main/resources/assets/new_soviet/sounds.json +++ b/src/main/resources/assets/new_soviet/sounds.json @@ -11,11 +11,38 @@ "new_soviet:siren" ] }, + "electric_hit": { + "subtitle": "subtitles.new_soviet.electric_hit", + "sounds": [ + "new_soviet:electric_hit" + ] + }, + "parquet_walk": { + "subtitle": "subtitles.new_soviet.parquet_walk", + "sounds": [ + "new_soviet:parquet_step_1", + "new_soviet:parquet_step_2", + "new_soviet:parquet_step_3", + "new_soviet:parquet_step_4" + ] + }, + "switch_press": { + "subtitle": "subtitles.new_soviet.switch_press", + "sounds": [ + "new_soviet:switch_press" + ] + }, "light_bulb_broken_sound": { "subtitle": "subtitles.new_soviet.light_bulb_broken", "sounds": [ "new_soviet:light_bulb_broken" ] + }, + "item_rake_till": { + "subtitle": "subtitles.new_soviet.item_rake_till", + "sounds": [ + "new_soviet:rake" + ] } } diff --git a/src/main/resources/assets/new_soviet/sounds/LICENSE b/src/main/resources/assets/new_soviet/sounds/LICENSE deleted file mode 100644 index 5767cda..0000000 --- a/src/main/resources/assets/new_soviet/sounds/LICENSE +++ /dev/null @@ -1 +0,0 @@ -File light_bulb_broken.ogg is converted .mp3 file which was made by Mike Koenig and licensed under CC Attribution 3.0 (https://creativecommons.org/licenses/by/3.0/). Original file is available at https://soundbible.com/105-Light-Bulb-Breaking.html \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/sounds/electric_hit.ogg b/src/main/resources/assets/new_soviet/sounds/electric_hit.ogg new file mode 100644 index 0000000..a88f902 Binary files /dev/null and b/src/main/resources/assets/new_soviet/sounds/electric_hit.ogg differ diff --git a/src/main/resources/assets/new_soviet/sounds/light_bulb_broken.ogg b/src/main/resources/assets/new_soviet/sounds/light_bulb_broken.ogg index 4ebd655..f6503db 100644 Binary files a/src/main/resources/assets/new_soviet/sounds/light_bulb_broken.ogg and b/src/main/resources/assets/new_soviet/sounds/light_bulb_broken.ogg differ diff --git a/src/main/resources/assets/new_soviet/sounds/parquet_step_1.ogg b/src/main/resources/assets/new_soviet/sounds/parquet_step_1.ogg new file mode 100644 index 0000000..e2a4e0b Binary files /dev/null and b/src/main/resources/assets/new_soviet/sounds/parquet_step_1.ogg differ diff --git a/src/main/resources/assets/new_soviet/sounds/parquet_step_2.ogg b/src/main/resources/assets/new_soviet/sounds/parquet_step_2.ogg new file mode 100644 index 0000000..3588770 Binary files /dev/null and b/src/main/resources/assets/new_soviet/sounds/parquet_step_2.ogg differ diff --git a/src/main/resources/assets/new_soviet/sounds/parquet_step_3.ogg b/src/main/resources/assets/new_soviet/sounds/parquet_step_3.ogg new file mode 100644 index 0000000..6fbd4bd Binary files /dev/null and b/src/main/resources/assets/new_soviet/sounds/parquet_step_3.ogg differ diff --git a/src/main/resources/assets/new_soviet/sounds/parquet_step_4.ogg b/src/main/resources/assets/new_soviet/sounds/parquet_step_4.ogg new file mode 100644 index 0000000..77f87ce Binary files /dev/null and b/src/main/resources/assets/new_soviet/sounds/parquet_step_4.ogg differ diff --git a/src/main/resources/assets/new_soviet/sounds/rake.ogg b/src/main/resources/assets/new_soviet/sounds/rake.ogg new file mode 100644 index 0000000..ecedae2 Binary files /dev/null and b/src/main/resources/assets/new_soviet/sounds/rake.ogg differ diff --git a/src/main/resources/assets/new_soviet/sounds/switch_press.ogg b/src/main/resources/assets/new_soviet/sounds/switch_press.ogg new file mode 100644 index 0000000..705711a Binary files /dev/null and b/src/main/resources/assets/new_soviet/sounds/switch_press.ogg differ diff --git a/src/main/resources/assets/new_soviet/textures/block/green/mossy_green_bricks_with_any.png b/src/main/resources/assets/new_soviet/textures/block/green/mossy_green_bricks_with_any.png new file mode 100644 index 0000000..2f4b977 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/green/mossy_green_bricks_with_any.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/green/variated/big_green_tile_сacked1.png b/src/main/resources/assets/new_soviet/textures/block/green/variated/big_green_tiles_cracked_1.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/green/variated/big_green_tile_сacked1.png rename to src/main/resources/assets/new_soviet/textures/block/green/variated/big_green_tiles_cracked_1.png diff --git a/src/main/resources/assets/new_soviet/textures/block/green/variated/big_green_tile_сacked2.png b/src/main/resources/assets/new_soviet/textures/block/green/variated/big_green_tiles_cracked_2.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/green/variated/big_green_tile_сacked2.png rename to src/main/resources/assets/new_soviet/textures/block/green/variated/big_green_tiles_cracked_2.png diff --git a/src/main/resources/assets/new_soviet/textures/block/green/variated/big_green_tile_сacked3.png b/src/main/resources/assets/new_soviet/textures/block/green/variated/big_green_tiles_cracked_3.png similarity index 100% rename from src/main/resources/assets/new_soviet/textures/block/green/variated/big_green_tile_сacked3.png rename to src/main/resources/assets/new_soviet/textures/block/green/variated/big_green_tiles_cracked_3.png diff --git a/src/main/resources/assets/new_soviet/textures/block/industrial/crate_1.png b/src/main/resources/assets/new_soviet/textures/block/industrial/crate_1.png new file mode 100644 index 0000000..8b94262 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/industrial/crate_1.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/industrial/crate_2.png b/src/main/resources/assets/new_soviet/textures/block/industrial/crate_2.png new file mode 100644 index 0000000..0cfcff0 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/industrial/crate_2.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/meat/meat.png b/src/main/resources/assets/new_soviet/textures/block/meat/meat.png new file mode 100644 index 0000000..f005662 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/meat/meat.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/meat/meat2.png b/src/main/resources/assets/new_soviet/textures/block/meat/meat2.png new file mode 100644 index 0000000..e46b432 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/meat/meat2.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/meat/meat3.png b/src/main/resources/assets/new_soviet/textures/block/meat/meat3.png new file mode 100644 index 0000000..7e3b93f Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/meat/meat3.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/meat/meat_eye.png b/src/main/resources/assets/new_soviet/textures/block/meat/meat_eye.png new file mode 100644 index 0000000..4af2838 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/meat/meat_eye.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/meat/meat_eye.png.mcmeta b/src/main/resources/assets/new_soviet/textures/block/meat/meat_eye.png.mcmeta new file mode 100644 index 0000000..bee4175 --- /dev/null +++ b/src/main/resources/assets/new_soviet/textures/block/meat/meat_eye.png.mcmeta @@ -0,0 +1,87 @@ +{ + "animation": { + "frametime": 3, + "interpolate": true, + "frames": [ + 0, + 0, + 1, + 1, + 0, + 0, + 1, + 2, + 4, + 5, + 6, + 7, + 8, + 7, + 6, + 5, + 4, + 2, + 1, + 17, + 18, + 3, + 10, + 0, + 1, + 0, + 0, + 1, + 2, + 4, + 5, + 4, + 2, + 1, + 0, + 3, + 10, + 10, + 3, + 0, + 0, + 0, + 17, + 17, + 0, + 19, + 0, + 19, + 19, + 19, + 19, + 0, + 17, + 18, + 0, + 0, + 1, + 2, + 1, + 0, + 10, + 3, + 3, + 10, + 0, + 1, + 2, + 4, + 1, + 0, + 0, + 1, + 2, + 1, + 17, + 18, + 3, + 10, + 0 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/textures/block/meat/meat_teeth.png b/src/main/resources/assets/new_soviet/textures/block/meat/meat_teeth.png new file mode 100644 index 0000000..60176f7 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/meat/meat_teeth.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/meat/meat_teeth.png.mcmeta b/src/main/resources/assets/new_soviet/textures/block/meat/meat_teeth.png.mcmeta new file mode 100644 index 0000000..2337b76 --- /dev/null +++ b/src/main/resources/assets/new_soviet/textures/block/meat/meat_teeth.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 4, + "frames": [0, 1, 2, 3, 4, 3, 2, 1] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/textures/block/purple_goo/purple_goo.png b/src/main/resources/assets/new_soviet/textures/block/purple_goo/purple_goo.png new file mode 100644 index 0000000..2ee7e92 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/purple_goo/purple_goo.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/purple_goo/purple_goo_side.png b/src/main/resources/assets/new_soviet/textures/block/purple_goo/purple_goo_side.png new file mode 100644 index 0000000..83f5081 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/purple_goo/purple_goo_side.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/red/glazed_red_tiles.png b/src/main/resources/assets/new_soviet/textures/block/red/glazed_red_tiles.png index b1092ff..d794566 100644 Binary files a/src/main/resources/assets/new_soviet/textures/block/red/glazed_red_tiles.png and b/src/main/resources/assets/new_soviet/textures/block/red/glazed_red_tiles.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/research_institute/nii_wall_1.png b/src/main/resources/assets/new_soviet/textures/block/research_institute/nii_wall_1.png index 8d1b3de..daf21bd 100644 Binary files a/src/main/resources/assets/new_soviet/textures/block/research_institute/nii_wall_1.png and b/src/main/resources/assets/new_soviet/textures/block/research_institute/nii_wall_1.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/wallpapers/beige_wallpaper.png b/src/main/resources/assets/new_soviet/textures/block/wallpapers/beige_wallpaper.png new file mode 100644 index 0000000..3aaaef5 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/wallpapers/beige_wallpaper.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/wallpapers/brown_wallpaper.png b/src/main/resources/assets/new_soviet/textures/block/wallpapers/brown_wallpaper.png new file mode 100644 index 0000000..ce4ca9d Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/wallpapers/brown_wallpaper.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/wallpapers/green_wallpaper.png b/src/main/resources/assets/new_soviet/textures/block/wallpapers/green_wallpaper.png new file mode 100644 index 0000000..566ac34 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/wallpapers/green_wallpaper.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/yellow/small_cracked_yellow_tiles.png b/src/main/resources/assets/new_soviet/textures/block/yellow/small_cracked_yellow_tiles.png new file mode 100644 index 0000000..0c94d29 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/yellow/small_cracked_yellow_tiles.png differ diff --git a/src/main/resources/assets/new_soviet/textures/item/concentrate.png b/src/main/resources/assets/new_soviet/textures/item/concentrate.png new file mode 100644 index 0000000..f5493a0 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/item/concentrate.png differ diff --git a/src/main/resources/assets/new_soviet/textures/item/purple_goo_item.png b/src/main/resources/assets/new_soviet/textures/item/purple_goo_item.png new file mode 100644 index 0000000..904e22c Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/item/purple_goo_item.png differ diff --git a/src/main/resources/assets/new_soviet/textures/item/rake.png b/src/main/resources/assets/new_soviet/textures/item/rake.png new file mode 100644 index 0000000..9b6d5c0 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/item/rake.png differ