From 14cfdf45b78a0b9890f0512ce38aeba47dbcf649 Mon Sep 17 00:00:00 2001 From: Mantis Date: Mon, 20 Mar 2023 21:56:29 +0000 Subject: [PATCH] Lang Fixes --- .../assets/back_in_classic/lang/en_uk.json | 34 +++++++------------ .../assets/back_in_classic/lang/en_us.json | 10 ++---- .../{blue_rose_flower.json => blue_rose.json} | 0 .../block/{rose_flower.json => red_rose.json} | 0 4 files changed, 15 insertions(+), 29 deletions(-) rename src/main/resources/assets/back_in_classic/models/block/{blue_rose_flower.json => blue_rose.json} (100%) rename src/main/resources/assets/back_in_classic/models/block/{rose_flower.json => red_rose.json} (100%) diff --git a/src/main/resources/assets/back_in_classic/lang/en_uk.json b/src/main/resources/assets/back_in_classic/lang/en_uk.json index 58940d3..edaeeae 100644 --- a/src/main/resources/assets/back_in_classic/lang/en_uk.json +++ b/src/main/resources/assets/back_in_classic/lang/en_uk.json @@ -8,62 +8,54 @@ "item.back_in_classic.extreme_wood_sword": "Extreme Wood Sword", "entity.back_in_classic.human": "Human", "item.back_in_classic.classic_nether": "Classic Nether Portal", - "block.back_in_classic.paeonia_flower": "Paeonia", "gamerule.doClassicOverworld.description": "Sets the world in a retro dimension.", "gamerule.doInfiniteWater.description": "um...be safe with setting this true", "gamerule.doOldCombat.description": "Brings back old combat mechanics. May require respawn to update.", "item.back_in_classic.nether_portal_creator": "Mini Nether Portal", "biome.back_in_classic.rainy_forest": "Rainy Forest", - "item.back_in_classic.plate_leggings": "Plated Trousers", - "item.back_in_classic.plate_helmet": "Plated Helmet", + "item.back_in_classic.plate_leggings": "Plated Leggings", + "item.back_in_classic.plate_helmet": "Plated Cap", "biome.back_in_classic.ice_desert": "Ice Desert", - "item.back_in_classic.extreme_stone_sword": "Extreme Stone Sword", + "item.back_in_classic.extreme_iron_sword": "Extreme Iron Sword", "block.back_in_classic.paeonia_flower": "Paeonia", - "item.back_in_classic.extreme_diamond_sword": "Extreme Diamond Sword", "gamerule.doOldCombat": "Do Old Combat", "gamerule.instantBow": "Instant Bow Shot", - "block.back_in_classic.nether_reactor_core": "Nether Reactor Core", - "key.back_in_classic.nether_portal_key": "Nether Portal Key", - "item.back_in_classic.stone_sword": "Stone Sword", "biome.back_in_classic.oak_forest": "Oak Forest", "gamerule.instantBow.description": "Shoots Instantly", "item.back_in_classic.classic_overworld": "Classic Overworld Portal Igniter", + "item.back_in_classic.extreme_gold_sword": "Extreme Gold Sword", "gamerule.doInfiniteWater": "Do Infinite Water/Lava Spawn", "subtitles.human_oof": "Human Oofs", "subtitles.instant_bow_shot": "Bow Shoots", "block.back_in_classic.infinite_water": "Infinite Water", "biome.back_in_classic.high_cliffs": "High Cliffs", "biome.back_in_classic.scenic_sand_beach": "Scenic Sand Beach", - "enchantment.back_in_classic.sharpshot": "Sharpshot", "gamerule.doBetaHunger.description": "Most foods heal instantly, and the player constantly has a set hunger and saturation.", "item.back_in_classic.human_spawn_egg": "Human Spawn Egg", "key.back_in_classic.uuidview": "UUID View", "key.back_in_classic.human_spawn": "Human Spawn", "subtitles.birds_chirping": "Birds Chirp", - "item.back_in_classic.extreme_gold_sword": "Extreme Gold Sword", "gamerule.doClassicOverworld": "Classic Overworld", - "item.back_in_classic.diamond_sword": "Diamond Sword", - "block.back_in_classic.blue_rose_flower": "Cave Rose", + "item.back_in_classic.extreme_diamond_sword": "Extreme Diamond Sword", + "key.back_in_classic.nether_portal_key": "Nether Portal Key", "subtitles.waterfall": "Water Crashes", "enchantment.back_in_classic.sharpshot": "Sharpshot", - "block.back_in_classic.blue_rose_flower": "Cave Rose", - "item.back_in_classic.plate_chestplate": "Plated Chestplate", + "block.back_in_classic.blue_rose": "Cave Rose", + "item.back_in_classic.plate_chestplate": "Plated Body", "biome.back_in_classic.classic_plains": "Classic Plains", - "item.back_in_classic.extreme_wood_sword": "Extreme Wood Sword", "subtitles.ocean_loop": "Waves Crash", - "item.back_in_classic.extreme_stone_sword": "Extreme Stone Sword", + "item.back_in_classic.extreme_stone_sword": "Extreme_Stone Sword", "block.back_in_classic.nether_reactor_core": "Nether Reactor Core", "biome.back_in_classic.scenic_gravel_beach": "Scenic Sand Beach", "item.back_in_classic.plate_boots": "Plated Boots", - "item.back_in_classic.extreme_iron_sword": "Extreme Iron Sword", "item.back_in_classic.fire": "Fire", - "block.back_in_classic.rose_flower": "Wild Rose", + "block.back_in_classic.red_rose": "Wild Rose", "block.back_in_classic.shrub": "Shrub", - "block.back_in_classic.glowing_obsidian": "Glowing Obsidian", + "block.back_in_classic.glowing_obsidian": "Red Obsidian", "block.back_in_classic.dirt_slab": "Dirt Slab", "block.back_in_classic.sod_slab": "Sod Slab", - "block.back_in_classic.gear": "Cog", - "block.back_in_classic.inverse_gear": "Cog", + "block.back_in_classic.gear": "Gear", + "block.back_in_classic.inverse_gear": "Gear", "block.back_in_classic.wax_block": "Wax Block", "block.back_in_classic.sod_block": "Sod Block" } \ No newline at end of file diff --git a/src/main/resources/assets/back_in_classic/lang/en_us.json b/src/main/resources/assets/back_in_classic/lang/en_us.json index e257312..edaeeae 100644 --- a/src/main/resources/assets/back_in_classic/lang/en_us.json +++ b/src/main/resources/assets/back_in_classic/lang/en_us.json @@ -8,7 +8,6 @@ "item.back_in_classic.extreme_wood_sword": "Extreme Wood Sword", "entity.back_in_classic.human": "Human", "item.back_in_classic.classic_nether": "Classic Nether Portal", - "block.back_in_classic.paeonia_flower": "Paeonia", "gamerule.doClassicOverworld.description": "Sets the world in a retro dimension.", "gamerule.doInfiniteWater.description": "um...be safe with setting this true", "gamerule.doOldCombat.description": "Brings back old combat mechanics. May require respawn to update.", @@ -21,8 +20,6 @@ "block.back_in_classic.paeonia_flower": "Paeonia", "gamerule.doOldCombat": "Do Old Combat", "gamerule.instantBow": "Instant Bow Shot", - "block.back_in_classic.nether_reactor_core": "Nether Reactor Core", - "key.back_in_classic.nether_portal_key": "Nether Portal Key", "biome.back_in_classic.oak_forest": "Oak Forest", "gamerule.instantBow.description": "Shoots Instantly", "item.back_in_classic.classic_overworld": "Classic Overworld Portal Igniter", @@ -33,7 +30,6 @@ "block.back_in_classic.infinite_water": "Infinite Water", "biome.back_in_classic.high_cliffs": "High Cliffs", "biome.back_in_classic.scenic_sand_beach": "Scenic Sand Beach", - "enchantment.back_in_classic.sharpshot": "Sharpshot", "gamerule.doBetaHunger.description": "Most foods heal instantly, and the player constantly has a set hunger and saturation.", "item.back_in_classic.human_spawn_egg": "Human Spawn Egg", "key.back_in_classic.uuidview": "UUID View", @@ -41,11 +37,10 @@ "subtitles.birds_chirping": "Birds Chirp", "gamerule.doClassicOverworld": "Classic Overworld", "item.back_in_classic.extreme_diamond_sword": "Extreme Diamond Sword", - "block.back_in_classic.blue_rose_flower": "Cave Rose", "key.back_in_classic.nether_portal_key": "Nether Portal Key", "subtitles.waterfall": "Water Crashes", "enchantment.back_in_classic.sharpshot": "Sharpshot", - "block.back_in_classic.blue_rose_flower": "Cave Rose", + "block.back_in_classic.blue_rose": "Cave Rose", "item.back_in_classic.plate_chestplate": "Plated Body", "biome.back_in_classic.classic_plains": "Classic Plains", "subtitles.ocean_loop": "Waves Crash", @@ -53,9 +48,8 @@ "block.back_in_classic.nether_reactor_core": "Nether Reactor Core", "biome.back_in_classic.scenic_gravel_beach": "Scenic Sand Beach", "item.back_in_classic.plate_boots": "Plated Boots", - "block.back_in_classic.rose_flower": "Wild Rose", "item.back_in_classic.fire": "Fire", - "block.back_in_classic.rose_flower": "Wild Rose", + "block.back_in_classic.red_rose": "Wild Rose", "block.back_in_classic.shrub": "Shrub", "block.back_in_classic.glowing_obsidian": "Red Obsidian", "block.back_in_classic.dirt_slab": "Dirt Slab", diff --git a/src/main/resources/assets/back_in_classic/models/block/blue_rose_flower.json b/src/main/resources/assets/back_in_classic/models/block/blue_rose.json similarity index 100% rename from src/main/resources/assets/back_in_classic/models/block/blue_rose_flower.json rename to src/main/resources/assets/back_in_classic/models/block/blue_rose.json diff --git a/src/main/resources/assets/back_in_classic/models/block/rose_flower.json b/src/main/resources/assets/back_in_classic/models/block/red_rose.json similarity index 100% rename from src/main/resources/assets/back_in_classic/models/block/rose_flower.json rename to src/main/resources/assets/back_in_classic/models/block/red_rose.json