From a6b4b16fd35cd4b18173ba47f2fec60a80ca9614 Mon Sep 17 00:00:00 2001 From: LemonCaramel Date: Tue, 25 May 2021 23:27:19 +0900 Subject: [PATCH] Add Missing Translation Mapping (#2484) --- .../data/TranslationMappings.java | 36 ++++++++++++------- .../data/mapping-lang-1.12-1.13.json | 8 +++++ 2 files changed, 31 insertions(+), 13 deletions(-) diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/data/TranslationMappings.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/data/TranslationMappings.java index cac81aa39..0e8c292c8 100644 --- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/data/TranslationMappings.java +++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_16to1_15_2/data/TranslationMappings.java @@ -31,29 +31,39 @@ public class TranslationMappings extends ComponentRewriter { public TranslationMappings(Protocol protocol) { super(protocol); + mappings.put("attribute.name.generic.armorToughness", "attribute.name.generic.armor_toughness"); + mappings.put("attribute.name.generic.attackDamage", "attribute.name.generic.attack_damage"); + mappings.put("attribute.name.generic.attackSpeed", "attribute.name.generic.attack_speed"); + mappings.put("attribute.name.generic.followRange", "attribute.name.generic.follow_range"); + mappings.put("attribute.name.generic.knockbackResistance", "attribute.name.generic.knockback_resistance"); + mappings.put("attribute.name.generic.maxHealth", "attribute.name.generic.max_health"); + mappings.put("attribute.name.generic.movementSpeed", "attribute.name.generic.movement_speed"); + mappings.put("attribute.name.horse.jumpStrength", "attribute.name.horse.jump_strength"); + mappings.put("attribute.name.zombie.spawnReinforcements", "attribute.name.zombie.spawn_reinforcements"); + mappings.put("block.minecraft.banner", "Banner"); + mappings.put("block.minecraft.wall_banner", "Wall Banner"); + mappings.put("block.minecraft.bed", "Bed"); + mappings.put("block.minecraft.bed.not_valid", "block.minecraft.spawn.not_valid"); + mappings.put("block.minecraft.bed.set_spawn", "block.minecraft.set_spawn"); mappings.put("block.minecraft.flowing_water", "Flowing Water"); mappings.put("block.minecraft.flowing_lava", "Flowing Lava"); - mappings.put("block.minecraft.bed", "Bed"); - mappings.put("block.minecraft.bed.not_valid", "Your home bed was missing or obstructed"); - mappings.put("block.minecraft.bed.set_spawn", "Respawn point set"); mappings.put("block.minecraft.two_turtle_eggs", "Two Turtle Eggs"); mappings.put("block.minecraft.three_turtle_eggs", "Three Turtle Eggs"); mappings.put("block.minecraft.four_turtle_eggs", "Four Turtle Eggs"); - mappings.put("block.minecraft.banner", "Banner"); - mappings.put("block.minecraft.wall_banner", "Wall Banner"); - mappings.put("item.minecraft.zombie_pigman_spawn_egg", "Zombie Pigman Spawn Egg"); - mappings.put("item.minecraft.skeleton_skull", "Skeleton Skull"); - mappings.put("item.minecraft.wither_skeleton_skull", "Wither Skeleton Skull"); - mappings.put("item.minecraft.zombie_head", "Zombie Head"); - mappings.put("item.minecraft.creeper_head", "Creeper Head"); - mappings.put("item.minecraft.dragon_head", "Dragon Head"); + mappings.put("item.minecraft.skeleton_skull", "block.minecraft.skeleton_skull"); + mappings.put("item.minecraft.wither_skeleton_skull", "block.minecraft.skeleton_wall_skull"); + mappings.put("item.minecraft.zombie_head", "block.minecraft.zombie_head"); + mappings.put("item.minecraft.creeper_head", "block.minecraft.creeper_head"); + mappings.put("item.minecraft.dragon_head", "block.minecraft.dragon_head"); mappings.put("entity.minecraft.zombie_pigman", "Zombie Pigman"); + mappings.put("item.minecraft.zombie_pigman_spawn_egg", "Zombie Pigman Spawn Egg"); mappings.put("death.fell.accident.water", "%1$s fell out of the water"); - mappings.put("death.attack.netherBed.message", "%1$s was killed by %2$s"); - mappings.put("death.attack.netherBed.link", "Intentional Game Design"); + mappings.put("death.attack.netherBed.message", "death.attack.badRespawnPoint.message"); + mappings.put("death.attack.netherBed.link", "death.attack.badRespawnPoint.link"); mappings.put("advancements.husbandry.break_diamond_hoe.title", "Serious Dedication"); mappings.put("advancements.husbandry.break_diamond_hoe.description", "Completely use up a diamond hoe, and then reevaluate your life choices"); mappings.put("biome.minecraft.nether", "Nether"); + mappings.put("key.swapHands", "key.swapOffhand"); } @Override diff --git a/common/src/main/resources/assets/viaversion/data/mapping-lang-1.12-1.13.json b/common/src/main/resources/assets/viaversion/data/mapping-lang-1.12-1.13.json index 265326831..bc62a15cb 100644 --- a/common/src/main/resources/assets/viaversion/data/mapping-lang-1.12-1.13.json +++ b/common/src/main/resources/assets/viaversion/data/mapping-lang-1.12-1.13.json @@ -724,8 +724,11 @@ "tile.dropper.name": "block.minecraft.dropper", "tile.musicBlock.name": "block.minecraft.note_block", "tile.cake.name": "block.minecraft.cake", + "tile.bed.noSleep": "block.minecraft.bed.no_sleep", + "tile.bed.notSafe": "block.minecraft.bed.not_safe", "tile.bed.occupied": "block.minecraft.bed.occupied", "tile.bed.notValid": "block.minecraft.bed.not_valid", + "tile.bed.tooFarAway": "block.minecraft.bed.too_far_away", "tile.ironTrapdoor.name": "block.minecraft.iron_trapdoor", "tile.web.name": "block.minecraft.cobweb", "tile.stonebricksmooth.name": "block.minecraft.stone_bricks", @@ -1562,8 +1565,13 @@ "commands.tp.success.coordinates": "commands.teleport.success.location.single", "commands.teleport.success.coordinates": "commands.teleport.success.location.single", "commands.whitelist.reloaded": null, + "commands.whitelist.add.failed": null, "commands.whitelist.add.success": null, + "commands.whitelist.remove.failed": null, "commands.whitelist.remove.success": null, + "commands.whitelist.list": null, + "commands.whitelist.disabled": null, + "commands.whitelist.enabled": null, "commands.advancement.advancementNotFound": null, "commands.scoreboard.players.enable.success": "commands.scoreboard.players.enable.success.single", "commands.scoreboard.teams.remove.success": "commands.team.remove.success",