diff --git a/TODO.md b/TODO.md index b5540fa..089b579 100644 --- a/TODO.md +++ b/TODO.md @@ -32,7 +32,8 @@ Goals left - QOL ## 0.4 * Implement antenna everywhere * Add crafting recipes for banner patterns; change item textures; remake grain -* Add translation for new concrete and potentially new achievements? +* Add RPR translation for new concrete and potentially new achievements? +* Concrete with bars 2 axis rotation * TV rework #3 (new colours, second static, ...?) * More landmines, land mine base item, create integration for it * Rework cigarette (code and some functionality) diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/beige_concrete_with_bars.json b/src/main/generated/data/new_soviet/loot_tables/blocks/beige_concrete_with_bars.json new file mode 100644 index 0000000..c75f09a --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/beige_concrete_with_bars.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_concrete_with_bars" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/loot_tables/blocks/blue_concrete_with_bars.json b/src/main/generated/data/new_soviet/loot_tables/blocks/blue_concrete_with_bars.json new file mode 100644 index 0000000..cab6e44 --- /dev/null +++ b/src/main/generated/data/new_soviet/loot_tables/blocks/blue_concrete_with_bars.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:blue_concrete_with_bars" + } + ], + "rolls": 1.0 + } + ] +} \ 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 3286c95..6e6663f 100644 --- a/src/main/resources/assets/new_soviet/lang/en_us.json +++ b/src/main/resources/assets/new_soviet/lang/en_us.json @@ -173,18 +173,27 @@ "block.new_soviet.chiseled_spruce_door": "Chiseled Spruce Door", "block.new_soviet.chiseled_birch_door": "Chiseled Birch Door", "subtitles.new_soviet.siren": "Siren goes off", + "block.new_soviet.concrete": "Concrete", + "block.new_soviet.orange_concrete": "Orange Concrete", + "block.new_soviet.dark_green_concrete": "Dark Green Concrete", "block.new_soviet.yellow_concrete": "Yellow Concrete", "block.new_soviet.beige_concrete": "Beige Concrete", "block.new_soviet.white_concrete": "White Concrete", "block.new_soviet.green_concrete": "Green Concrete", "block.new_soviet.blue_concrete": "Blue Concrete", "block.new_soviet.red_concrete": "Red Concrete", + "block.new_soviet.cracked_concrete": "Cracked Concrete", + "block.new_soviet.cracked_orange_concrete": "Cracked Orange Concrete", + "block.new_soviet.cracked_dark_green_concrete": "Cracked Dark Green Concrete", "block.new_soviet.cracked_yellow_concrete": "Cracked Yellow Concrete", "block.new_soviet.cracked_beige_concrete": "Cracked Beige Concrete", "block.new_soviet.cracked_white_concrete": "Cracked White Concrete", "block.new_soviet.cracked_green_concrete": "Cracked Green Concrete", "block.new_soviet.cracked_blue_concrete": "Cracked Blue Concrete", "block.new_soviet.cracked_red_concrete": "Cracked Red Concrete", + "block.new_soviet.concrete_with_bars": "Concrete With Bars", + "block.new_soviet.orange_concrete_with_bars": "Orange Concrete With Bars", + "block.new_soviet.dark_green_concrete_with_bars": "Dark Green Concrete With Bars", "block.new_soviet.yellow_concrete_with_bars": "Yellow Concrete With Bars", "block.new_soviet.beige_concrete_with_bars": "Beige Concrete With Bars", "block.new_soviet.white_concrete_with_bars": "White Concrete With Bars", @@ -362,6 +371,10 @@ "block.new_soviet.cracked_tuff_bricks_stairs": "Cracked Tuff Brick Stairs", "block.new_soviet.mossy_tuff_bricks_slab": "Mossy Tuff Brick Slab", "block.new_soviet.mossy_tuff_bricks_stairs": "Mossy Tuff Brick Stairs", + "block.new_soviet.concrete_slab": "Concrete Slab", + "block.new_soviet.concrete_stairs": "Concrete Stairs", + "block.new_soviet.cracked_concrete_slab": "Cracked Concrete Slab", + "block.new_soviet.cracked_concrete_stairs": "Cracked Concrete Stairs", "block.new_soviet.white_concrete_slab": "White Concrete Slab", "block.new_soviet.white_concrete_stairs": "White Concrete Stairs", "block.new_soviet.cracked_white_concrete_slab": "Cracked White Concrete Slab", @@ -386,6 +399,14 @@ "block.new_soviet.green_concrete_stairs": "Green Concrete Stairs", "block.new_soviet.cracked_green_concrete_slab": "Cracked Green Concrete Slab", "block.new_soviet.cracked_green_concrete_stairs": "Cracked Green Concrete Stairs", + "block.new_soviet.dark_green_concrete_slab": "Dark Green Concrete Slab", + "block.new_soviet.dark_green_concrete_stairs": "Dark Green Concrete Stairs", + "block.new_soviet.cracked_dark_green_concrete_slab": "Cracked Dark Green Concrete Slab", + "block.new_soviet.cracked_dark_green_concrete_stairs": "Cracked Dark Green Concrete Stairs", + "block.new_soviet.orange_concrete_slab": "Orange Concrete Slab", + "block.new_soviet.orange_concrete_stairs": "Orange Concrete Stairs", + "block.new_soviet.cracked_orange_concrete_slab": "Cracked Orange Concrete Slab", + "block.new_soviet.cracked_orange_concrete_stairs": "Cracked Orange Concrete Stairs", "block.new_soviet.nii_floor_slab": "Nii Floor Slab", "block.new_soviet.nii_floor_stairs": "Nii Floor Stairs", "block.new_soviet.herringbone_acacia_planks_slab": "Herringbone Acacia Slab", diff --git a/src/main/resources/assets/new_soviet/lang/ru_ru.json b/src/main/resources/assets/new_soviet/lang/ru_ru.json index 0e08aaf..fd554dc 100644 --- a/src/main/resources/assets/new_soviet/lang/ru_ru.json +++ b/src/main/resources/assets/new_soviet/lang/ru_ru.json @@ -173,18 +173,27 @@ "block.new_soviet.chiseled_spruce_door": "Резная еловая дверь", "block.new_soviet.chiseled_birch_door": "Резная берёзовая дверь", "subtitles.new_soviet.siren": "Включается сирена", + "block.new_soviet.concrete": "Железобетон", + "block.new_soviet.orange_concrete": "Оранжевый железобетон", + "block.new_soviet.dark_green_concrete": "Темно-зелёный железобетон", "block.new_soviet.yellow_concrete": "Жёлтый железобетон", "block.new_soviet.beige_concrete": "Бежевый железобетон", "block.new_soviet.white_concrete": "Белый железобетон", "block.new_soviet.green_concrete": "Зелёный железобетон", "block.new_soviet.blue_concrete": "Синий железобетон", "block.new_soviet.red_concrete": "Красный железобетон", + "block.new_soviet.cracked_concrete": "Потрескавшийся железобетон", + "block.new_soviet.cracked_orange_concrete": "Потрескавшийся оранжевый железобетон", + "block.new_soviet.cracked_dark_green_concrete": "Потрескавшийся темно-зелёный железобетон", "block.new_soviet.cracked_yellow_concrete": "Потрескавшийся жёлтый железобетон", "block.new_soviet.cracked_beige_concrete": "Потрескавшийся бежевый железобетон", "block.new_soviet.cracked_white_concrete": "Потрескавшийся белый железобетон", "block.new_soviet.cracked_green_concrete": "Потрескавшийся зелёный железобетон", "block.new_soviet.cracked_blue_concrete": "Потрескавшийся синий железобетон", "block.new_soviet.cracked_red_concrete": "Потрескавшийся красный Concrete", + "block.new_soviet.concrete_with_bars": "Железобетон с арматурой", + "block.new_soviet.orange_concrete_with_bars": "Оранжевый железобетон с арматурой", + "block.new_soviet.dark_green_concrete_with_bars": "Темно-зелёный железобетон с арматурой", "block.new_soviet.yellow_concrete_with_bars": "Жёлтый железобетон с арматурой", "block.new_soviet.beige_concrete_with_bars": "Бежевый железобетон с арматурой", "block.new_soviet.white_concrete_with_bars": "Белый железобетон с арматурой", @@ -362,6 +371,10 @@ "block.new_soviet.cracked_tuff_bricks_stairs": "Ступени из потрескавшихся туфовых кирпичей", "block.new_soviet.mossy_tuff_bricks_slab": "Плита из замшелых туфовых кирпичей", "block.new_soviet.mossy_tuff_bricks_stairs": "ступени из замшелых туфовых кирпичей", + "block.new_soviet.concrete_slab": "Плита из железобетона", + "block.new_soviet.concrete_stairs": "Ступени из железобетона", + "block.new_soviet.cracked_concrete_slab": "Плита из потрескавшегося железобетона", + "block.new_soviet.cracked_concrete_stairs": "Ступени из потрескавшегося железобетона", "block.new_soviet.white_concrete_slab": "Плита из белого железобетона", "block.new_soviet.white_concrete_stairs": "Ступени из белого железобетона", "block.new_soviet.cracked_white_concrete_slab": "Плита из потрескавшегося белого железобетона", @@ -386,6 +399,14 @@ "block.new_soviet.green_concrete_stairs": "Ступени из зелёного железобетона", "block.new_soviet.cracked_green_concrete_slab": "Плита из потрескавшегося зелёного железобетона", "block.new_soviet.cracked_green_concrete_stairs": "Ступени из потрескавшегося зелёного железобетона", + "block.new_soviet.dark_green_concrete_slab": "Плита из тёмно-зелёного железобетона", + "block.new_soviet.dark_green_concrete_stairs": "Ступени из тёмно-зелёного железобетона", + "block.new_soviet.cracked_dark_green_concrete_slab": "Плита из потрескавшегося тёмно-зелёного железобетона", + "block.new_soviet.cracked_dark_green_concrete_stairs": "Ступени из потрескавшегося тёмно-зелёного железобетона", + "block.new_soviet.orange_concrete_slab": "Плита из оранжевого железобетона", + "block.new_soviet.orange_concrete_stairs": "Ступени из оранжевого железобетона", + "block.new_soviet.cracked_orange_concrete_slab": "Плита из потрескавшегося оранжевого железобетона", + "block.new_soviet.cracked_orange_concrete_stairs": "Ступени из потрескавшегося оранжевого железобетона", "block.new_soviet.nii_floor_slab": "Плита из каменной мозайки", "block.new_soviet.nii_floor_stairs": "Ступени из каменной мозайки", "block.new_soviet.herringbone_acacia_planks_slab": "Плита из акациевого паркета «ёлочкой»",