From 06909e5caa54ed6e7fbe287726bd0217395694ec Mon Sep 17 00:00:00 2001 From: ChuijkYahus <94828194+ChuijkYahus@users.noreply.github.com> Date: Fri, 29 Nov 2024 17:10:01 +0800 Subject: [PATCH] =?UTF-8?q?Oreganized=20=E4=B8=8E=20Doom=20&=20Gloom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../doom-gloom/doom_and_gloom/lang/en_us.json | 63 +++++++++++++++++++ .../doom_and_gloom/lang/zh_cn-base.json | 31 +++++++++ .../lang/zh_cn-composition.json | 47 ++++++++++++++ .../doom_and_gloom/packer-policy.json | 12 ++++ .../lang/{zh_cn.json => zh_cn-base.json} | 55 ++-------------- .../oreganized/lang/zh_cn-composition.json | 49 +++++++++++++++ .../oreganized/oreganized/packer-policy.json | 12 ++++ 7 files changed, 219 insertions(+), 50 deletions(-) create mode 100644 projects/1.20/assets/doom-gloom/doom_and_gloom/lang/en_us.json create mode 100644 projects/1.20/assets/doom-gloom/doom_and_gloom/lang/zh_cn-base.json create mode 100644 projects/1.20/assets/doom-gloom/doom_and_gloom/lang/zh_cn-composition.json create mode 100644 projects/1.20/assets/doom-gloom/doom_and_gloom/packer-policy.json rename projects/1.20/assets/oreganized/oreganized/lang/{zh_cn.json => zh_cn-base.json} (64%) create mode 100644 projects/1.20/assets/oreganized/oreganized/lang/zh_cn-composition.json create mode 100644 projects/1.20/assets/oreganized/oreganized/packer-policy.json diff --git a/projects/1.20/assets/doom-gloom/doom_and_gloom/lang/en_us.json b/projects/1.20/assets/doom-gloom/doom_and_gloom/lang/en_us.json new file mode 100644 index 000000000000..d0eaad526e55 --- /dev/null +++ b/projects/1.20/assets/doom-gloom/doom_and_gloom/lang/en_us.json @@ -0,0 +1,63 @@ +{ + "block.doom_and_gloom.amber_vigil_candle": "Amber Vigil Candle", + "block.doom_and_gloom.aqua_vigil_candle": "Aqua Vigil Candle", + "block.doom_and_gloom.beige_vigil_candle": "Beige Vigil Candle", + "block.doom_and_gloom.black_vigil_candle": "Black Vigil Candle", + "block.doom_and_gloom.blue_vigil_candle": "Blue Vigil Candle", + "block.doom_and_gloom.bone_pile": "Pile of Bones", + "block.doom_and_gloom.brown_vigil_candle": "Brown Vigil Candle", + "block.doom_and_gloom.burial_dirt": "Burial Dirt", + "block.doom_and_gloom.coral_vigil_candle": "Coral Vigil Candle", + "block.doom_and_gloom.cyan_vigil_candle": "Cyan Vigil Candle", + "block.doom_and_gloom.forest_vigil_candle": "Forest Vigil Candle", + "block.doom_and_gloom.ginger_vigil_candle": "Ginger Vigil Candle", + "block.doom_and_gloom.gray_vigil_candle": "Gray Vigil Candle", + "block.doom_and_gloom.green_vigil_candle": "Green Vigil Candle", + "block.doom_and_gloom.indigo_vigil_candle": "Indigo Vigil Candle", + "block.doom_and_gloom.light_blue_vigil_candle": "Light Blue Vigil Candle", + "block.doom_and_gloom.light_gray_vigil_candle": "Light Gray Vigil Candle", + "block.doom_and_gloom.lime_vigil_candle": "Lime Vigil Candle", + "block.doom_and_gloom.magenta_vigil_candle": "Magenta Vigil Candle", + "block.doom_and_gloom.maroon_vigil_candle": "Maroon Vigil Candle", + "block.doom_and_gloom.mint_vigil_candle": "Mint Vigil Candle", + "block.doom_and_gloom.navy_vigil_candle": "Navy Vigil Candle", + "block.doom_and_gloom.olive_vigil_candle": "Olive Vigil Candle", + "block.doom_and_gloom.orange_vigil_candle": "Orange Vigil Candle", + "block.doom_and_gloom.pink_vigil_candle": "Pink Vigil Candle", + "block.doom_and_gloom.purple_vigil_candle": "Purple Vigil Candle", + "block.doom_and_gloom.red_vigil_candle": "Red Vigil Candle", + "block.doom_and_gloom.rose_vigil_candle": "Rose Vigil Candle", + "block.doom_and_gloom.rotting_flesh": "Rotting Flesh", + "block.doom_and_gloom.sepulcher": "Sepulcher", + "block.doom_and_gloom.slate_vigil_candle": "Slate Vigil Candle", + "block.doom_and_gloom.stone_tablet": "Stone Tablet", + "block.doom_and_gloom.tan_vigil_candle": "Tan Vigil Candle", + "block.doom_and_gloom.teal_vigil_candle": "Teal Vigil Candle", + "block.doom_and_gloom.verdant_vigil_candle": "Verdant Vigil Candle", + "block.doom_and_gloom.vigil_candle": "Vigil Candle", + "block.doom_and_gloom.white_vigil_candle": "White Vigil Candle", + "block.doom_and_gloom.yellow_vigil_candle": "Yellow Vigil Candle", + "effect.doom_and_gloom.fog": "Fog", + "effect.doom_and_gloom.fog.description": "An eerie fog that accompanies the holler", + "effect.doom_and_gloom.warding": "Warding", + "effect.doom_and_gloom.warding.description": "Wards against evil spirits", + "entity.doom_and_gloom.dirt_mound": "Dirt Mound", + "entity.doom_and_gloom.holler": "Holler", + "entity.minecraft.villager.doom_and_gloom.gravetender": "Gravetender", + "gui.doom_and_gloom.stone_tablet.cancel": "Cancel", + "gui.doom_and_gloom.stone_tablet.engrave": "Engrave", + "item.doom_and_gloom.bush_hammer": "Bush Hammer", + "item.doom_and_gloom.holler_spawn_egg": "Holler Spawn Egg", + "item.doom_and_gloom.music_disc_afterlife": "Music Disc", + "item.doom_and_gloom.music_disc_afterlife.desc": "Firch - afterlife", + "subtitles.block.sepulcher.corpse_stuffed": "Sepulcher consumes corpse", + "subtitles.block.sepulcher.filled": "Sepulcher filled", + "subtitles.block.sepulcher.harvest": "Sepulcher emptied", + "subtitles.block.sepulcher.rotting": "Sepulcher rotting", + "subtitles.block.sepulcher.sealing": "Sepulcher sealed", + "subtitles.block.sepulcher.unsealing": "Sepulcher opened", + "subtitles.entity.holler_death": "Holler dies", + "subtitles.entity.holler_hollers": "Holler wails", + "subtitles.entity.holler_hurt": "Holler hurts", + "subtitles.entity.holler_shrieks": "Holler shrieks" +} \ No newline at end of file diff --git a/projects/1.20/assets/doom-gloom/doom_and_gloom/lang/zh_cn-base.json b/projects/1.20/assets/doom-gloom/doom_and_gloom/lang/zh_cn-base.json new file mode 100644 index 000000000000..5c67b2f46898 --- /dev/null +++ b/projects/1.20/assets/doom-gloom/doom_and_gloom/lang/zh_cn-base.json @@ -0,0 +1,31 @@ +{ + "block.doom_and_gloom.bone_pile": "骨头堆", + "block.doom_and_gloom.burial_dirt": "坟土", + "block.doom_and_gloom.rotting_flesh": "腐坏烂肉", + "block.doom_and_gloom.sepulcher": "墓盆", + "block.doom_and_gloom.stone_tablet": "石板", + "block.doom_and_gloom.vigil_candle": "守夜蜡烛", + "effect.doom_and_gloom.fog": "雾萦", + "effect.doom_and_gloom.fog.description": "随嚎魂而来的怪异迷雾", + "effect.doom_and_gloom.warding": "驱魂", + "effect.doom_and_gloom.warding.description": "能驱散邪恶的灵体", + "entity.doom_and_gloom.dirt_mound": "土冢", + "entity.doom_and_gloom.holler": "嚎魂", + "entity.minecraft.villager.doom_and_gloom.gravetender": "守墓人", + "gui.doom_and_gloom.stone_tablet.cancel": "取消", + "gui.doom_and_gloom.stone_tablet.engrave": "雕刻", + "item.doom_and_gloom.bush_hammer": "凿石锤", + "item.doom_and_gloom.holler_spawn_egg": "嚎魂刷怪蛋", + "item.doom_and_gloom.music_disc_afterlife": "音乐唱片", + "item.doom_and_gloom.music_disc_afterlife.desc": "Firch - afterlife", + "subtitles.block.sepulcher.corpse_stuffed": "墓盆：消耗尸体", + "subtitles.block.sepulcher.filled": "墓盆：填充", + "subtitles.block.sepulcher.harvest": "墓盆：清空", + "subtitles.block.sepulcher.rotting": "墓盆：积腐", + "subtitles.block.sepulcher.sealing": "墓盆：封口", + "subtitles.block.sepulcher.unsealing": "墓盆：开启", + "subtitles.entity.holler_death": "嚎魂：死亡", + "subtitles.entity.holler_hollers": "嚎魂：哭号", + "subtitles.entity.holler_hurt": "嚎魂：受伤", + "subtitles.entity.holler_shrieks": "嚎魂：尖啸" +} \ No newline at end of file diff --git a/projects/1.20/assets/doom-gloom/doom_and_gloom/lang/zh_cn-composition.json b/projects/1.20/assets/doom-gloom/doom_and_gloom/lang/zh_cn-composition.json new file mode 100644 index 000000000000..22e91958f7eb --- /dev/null +++ b/projects/1.20/assets/doom-gloom/doom_and_gloom/lang/zh_cn-composition.json @@ -0,0 +1,47 @@ +{ + "target": "assets/doom_and_gloom/lang/zh_cn.json", + "entries": [ + { + "templates": { + "block.doom_and_gloom.{0}_vigil_candle": "{0}守夜蜡烛" + }, + "parameters": [ + { + "white": "白色", + "light_gray": "淡灰色", + "gray": "灰色", + "black": "黑色", + "brown": "棕色", + "red": "红色", + "orange": "橙色", + "yellow": "黄色", + "lime": "黄绿色", + "green": "绿色", + "cyan": "青色", + "light_blue": "淡蓝色", + "blue": "蓝色", + "purple": "紫色", + "magenta": "品红色", + "pink": "粉红色", + + "amber": "琥珀黄色", + "aqua": "水蓝色", + "beige": "米黄色", + "coral": "珊瑚红色", + "forest": "森绿色", + "ginger": "姜橙色", + "indigo": "蓝紫色", + "maroon": "褐红色", + "mint": "薄青色", + "navy": "藏蓝色", + "olive": "橄榄黄色", + "rose": "玫红色", + "slate": "岩蓝色", + "tan": "淡棕色", + "teal": "鸭绿色", + "verdant": "翠绿色" + } + ] + } + ] +} \ No newline at end of file diff --git a/projects/1.20/assets/doom-gloom/doom_and_gloom/packer-policy.json b/projects/1.20/assets/doom-gloom/doom_and_gloom/packer-policy.json new file mode 100644 index 000000000000..4b441cfab91b --- /dev/null +++ b/projects/1.20/assets/doom-gloom/doom_and_gloom/packer-policy.json @@ -0,0 +1,12 @@ +[ + { + "type": "singleton", + "source": "projects/1.20/assets/doom-gloom/doom_and_gloom/lang/zh_cn-base.json", + "relativePath": "lang/zh_cn.json" + }, + { + "type": "composition", + "destType": "json", + "source": "projects/1.20/assets/doom-gloom/doom_and_gloom/lang/zh_cn-composition.json" + } +] \ No newline at end of file diff --git a/projects/1.20/assets/oreganized/oreganized/lang/zh_cn.json b/projects/1.20/assets/oreganized/oreganized/lang/zh_cn-base.json similarity index 64% rename from projects/1.20/assets/oreganized/oreganized/lang/zh_cn.json rename to projects/1.20/assets/oreganized/oreganized/lang/zh_cn-base.json index 924b75f1da6c..111194d8e224 100644 --- a/projects/1.20/assets/oreganized/oreganized/lang/zh_cn.json +++ b/projects/1.20/assets/oreganized/oreganized/lang/zh_cn-base.json @@ -9,6 +9,8 @@ "advancements.oreganized.garglin_water.title": "咕嘟咕嘟", "advancements.oreganized.groovy.description": "用划线笔在冰上划出纹路！", "advancements.oreganized.groovy.title": "酷炫划纹", + "advancements.oreganized.lead_to_dust.description": "挖掘铅矿石时，不在旁边放置用以阻止剧毒粉尘形成的水", + "advancements.oreganized.lead_to_dust.title": "剧毒铅尘", "advancements.oreganized.like_the_romans.description": "与铅交互以获得脑损伤", "advancements.oreganized.like_the_romans.title": "就像罗马人一样", "advancements.oreganized.melting_point.description": "从炼药锅中盛起熔融铅", @@ -22,16 +24,8 @@ "advancements.oreganized.weeping_devil.description": "用银锭换来滴水兽地狱般的吼叫", "advancements.oreganized.weeping_devil.title": "哭泣的恶魔", "attribute.oreganized.kinetic_damage": "动能伤害", - "block.oreganized.black_crystal_glass": "黑色铅玻璃", - "block.oreganized.black_crystal_glass_pane": "黑色铅玻璃板", - "block.oreganized.blue_crystal_glass": "蓝色铅玻璃", - "block.oreganized.blue_crystal_glass_pane": "蓝色铅玻璃板", - "block.oreganized.brown_crystal_glass": "棕色铅玻璃", - "block.oreganized.brown_crystal_glass_pane": "棕色铅玻璃板", "block.oreganized.chiseled_glance": "雕纹方铅岩", "block.oreganized.cut_lead": "切制铅块", - "block.oreganized.cyan_crystal_glass": "青色铅玻璃", - "block.oreganized.cyan_crystal_glass_pane": "青色铅玻璃板", "block.oreganized.deepslate_lead_ore": "深层铅矿石", "block.oreganized.deepslate_silver_ore": "深层银矿石", "block.oreganized.electrum_block": "琥珀金块", @@ -44,10 +38,6 @@ "block.oreganized.glance_slab": "方铅岩台阶", "block.oreganized.glance_stairs": "方铅岩楼梯", "block.oreganized.glance_wall": "方铅岩墙", - "block.oreganized.gray_crystal_glass": "灰色铅玻璃", - "block.oreganized.gray_crystal_glass_pane": "灰色铅玻璃板", - "block.oreganized.green_crystal_glass": "绿色铅玻璃", - "block.oreganized.green_crystal_glass_pane": "绿色铅玻璃板", "block.oreganized.grooved_blue_ice": "划纹蓝冰", "block.oreganized.grooved_ice": "划纹冰", "block.oreganized.grooved_packed_ice": "划纹浮冰", @@ -60,56 +50,20 @@ "block.oreganized.lead_ore": "铅矿石", "block.oreganized.lead_pillar": "铅柱", "block.oreganized.lead_trapdoor": "铅活板门", - "block.oreganized.light_blue_crystal_glass": "淡蓝色铅玻璃", - "block.oreganized.light_blue_crystal_glass_pane": "淡蓝色铅玻璃板", - "block.oreganized.light_gray_crystal_glass": "淡灰色铅玻璃", - "block.oreganized.light_gray_crystal_glass_pane": "淡灰色铅玻璃板", - "block.oreganized.lime_crystal_glass": "黄绿色铅玻璃", - "block.oreganized.lime_crystal_glass_pane": "黄绿色铅玻璃板", - "block.oreganized.magenta_crystal_glass": "品红色铅玻璃", - "block.oreganized.magenta_crystal_glass_pane": "品红色铅玻璃板", "block.oreganized.molten_lead": "熔融铅", "block.oreganized.molten_lead_cauldron": "装有熔融铅的炼药锅", - "block.oreganized.orange_crystal_glass": "橙色铅玻璃", - "block.oreganized.orange_crystal_glass_pane": "橙色铅玻璃板", - "block.oreganized.pink_crystal_glass": "粉红色铅玻璃", - "block.oreganized.pink_crystal_glass_pane": "粉红色铅玻璃板", "block.oreganized.polished_glance": "磨制方铅岩", "block.oreganized.polished_glance_slab": "磨制方铅岩台阶", "block.oreganized.polished_glance_stairs": "磨制方铅岩楼梯", - "block.oreganized.purple_crystal_glass": "紫色铅玻璃", - "block.oreganized.purple_crystal_glass_pane": "紫色铅玻璃板", "block.oreganized.raw_lead_block": "粗铅块", "block.oreganized.raw_silver_block": "粗银块", - "block.oreganized.red_crystal_glass": "红色铅玻璃", - "block.oreganized.red_crystal_glass_pane": "红色铅玻璃板", "block.oreganized.shrapnel_bomb": "破片炸弹", "block.oreganized.silver_block": "银块", "block.oreganized.silver_ore": "银矿石", "block.oreganized.spotted_glance": "镶矿方铅岩", - "block.oreganized.waxed_black_concrete_powder": "涂蜡的黑色混凝土粉末", - "block.oreganized.waxed_blue_concrete_powder": "涂蜡的蓝色混凝土粉末", - "block.oreganized.waxed_brown_concrete_powder": "涂蜡的棕色混凝土粉末", - "block.oreganized.waxed_cyan_concrete_powder": "涂蜡的青色混凝土粉末", - "block.oreganized.waxed_gray_concrete_powder": "涂蜡的灰色混凝土粉末", - "block.oreganized.waxed_green_concrete_powder": "涂蜡的绿色混凝土粉末", - "block.oreganized.waxed_light_blue_concrete_powder": "涂蜡的淡蓝色混凝土粉末", - "block.oreganized.waxed_light_gray_concrete_powder": "涂蜡的淡灰色混凝土粉末", - "block.oreganized.waxed_lime_concrete_powder": "涂蜡的黄绿色混凝土粉末", - "block.oreganized.waxed_magenta_concrete_powder": "涂蜡的品红色混凝土粉末", - "block.oreganized.waxed_orange_concrete_powder": "涂蜡的橙色混凝土粉末", - "block.oreganized.waxed_pink_concrete_powder": "涂蜡的粉红色混凝土粉末", - "block.oreganized.waxed_purple_concrete_powder": "涂蜡的紫色混凝土粉末", - "block.oreganized.waxed_red_concrete_powder": "涂蜡的红色混凝土粉末", "block.oreganized.waxed_spotted_glance": "涂蜡的镶矿方铅岩", - "block.oreganized.waxed_white_concrete_powder": "涂蜡的白色混凝土粉末", - "block.oreganized.waxed_yellow_concrete_powder": "涂蜡的黄色混凝土粉末", - "block.oreganized.white_crystal_glass": "白色铅玻璃", - "block.oreganized.white_crystal_glass_pane": "白色铅玻璃板", - "block.oreganized.yellow_crystal_glass": "黄色铅玻璃", - "block.oreganized.yellow_crystal_glass_pane": "黄色铅玻璃板", - "death.attack.lead_bolt": "%1$s被%2$s射杀", - "death.attack.lead_bolt.item": "%1$s被%2$s用%3$s射杀", + "death.attack.lead_bolt": "%1$s被%2$s射杀了", + "death.attack.lead_bolt.item": "%1$s被%2$s用%3$s射杀了", "death.attack.molten_lead": "%1$s对滚烫的金属爱不释手", "effect.oreganized.stunning": "脑损伤", "effect.oreganized.stunning.description": "每过随机间隔麻痹目标", @@ -136,6 +90,7 @@ "item.oreganized.electrum_shield": "琥珀金盾牌", "item.oreganized.electrum_shovel": "琥珀金锹", "item.oreganized.electrum_sword": "琥珀金剑", + "item.oreganized.flint_and_pewter": "扬尘石", "item.oreganized.lead_bolt": "铅弩箭", "item.oreganized.lead_ingot": "铅锭", "item.oreganized.lead_nugget": "铅粒", diff --git a/projects/1.20/assets/oreganized/oreganized/lang/zh_cn-composition.json b/projects/1.20/assets/oreganized/oreganized/lang/zh_cn-composition.json new file mode 100644 index 000000000000..76b985713f96 --- /dev/null +++ b/projects/1.20/assets/oreganized/oreganized/lang/zh_cn-composition.json @@ -0,0 +1,49 @@ +{ + "target": "assets/oreganized/lang/zh_cn.json", + "entries": [ + { + "templates": { + "block.oreganized.{0}_crystal_glass": "{0}铅玻璃", + "block.oreganized.{0}_crystal_glass_pane": "{0}铅玻璃板", + "block.oreganized.waxed_{0}_concrete_powder": "涂蜡的{0}混凝土粉末" + }, + "parameters": [ + { + "white": "白色", + "light_gray": "淡灰色", + "gray": "灰色", + "black": "黑色", + "brown": "棕色", + "red": "红色", + "orange": "橙色", + "yellow": "黄色", + "lime": "黄绿色", + "green": "绿色", + "cyan": "青色", + "light_blue": "淡蓝色", + "blue": "蓝色", + "purple": "紫色", + "magenta": "品红色", + "pink": "粉红色", + + "amber": "琥珀黄色", + "aqua": "水蓝色", + "beige": "米黄色", + "coral": "珊瑚红色", + "forest": "森绿色", + "ginger": "姜橙色", + "indigo": "蓝紫色", + "maroon": "褐红色", + "mint": "薄青色", + "navy": "藏蓝色", + "olive": "橄榄黄色", + "rose": "玫红色", + "slate": "岩蓝色", + "tan": "淡棕色", + "teal": "鸭绿色", + "verdant": "翠绿色" + } + ] + } + ] +} \ No newline at end of file diff --git a/projects/1.20/assets/oreganized/oreganized/packer-policy.json b/projects/1.20/assets/oreganized/oreganized/packer-policy.json new file mode 100644 index 000000000000..bf45f3919bea --- /dev/null +++ b/projects/1.20/assets/oreganized/oreganized/packer-policy.json @@ -0,0 +1,12 @@ +[ + { + "type": "singleton", + "source": "projects/1.20/assets/oreganized/oreganized/lang/zh_cn-base.json", + "relativePath": "lang/zh_cn.json" + }, + { + "type": "composition", + "destType": "json", + "source": "projects/1.20/assets/oreganized/oreganized/lang/zh_cn-composition.json" + } +] \ No newline at end of file