From 8e10deeac1981f088684647ecc981084db873b81 Mon Sep 17 00:00:00 2001 From: mamaruo Date: Sat, 26 Feb 2022 23:08:15 +0800 Subject: [PATCH 1/7] new oldguns --- .../1.16/assets/oldguns/oldguns/en_us.json | 79 +++++++++++++++++++ .../1.16/assets/oldguns/oldguns/zh_cn.json | 79 +++++++++++++++++++ 2 files changed, 158 insertions(+) create mode 100644 projects/1.16/assets/oldguns/oldguns/en_us.json create mode 100644 projects/1.16/assets/oldguns/oldguns/zh_cn.json diff --git a/projects/1.16/assets/oldguns/oldguns/en_us.json b/projects/1.16/assets/oldguns/oldguns/en_us.json new file mode 100644 index 000000000000..ce341e1c41b5 --- /dev/null +++ b/projects/1.16/assets/oldguns/oldguns/en_us.json @@ -0,0 +1,79 @@ +{ + "item.oldguns.bullets.small_bullet": "Small Size Bullet", + "item.oldguns.bullets.medium_bullet": "Medium Size Bullet", + "item.oldguns.bullets.big_bullet": "Big Size Bullet", + "item.oldguns.bullets.musket_bullet": "Musket Bullet", + "item.oldguns.bullets.shotgun_bullet": "Shotgun Bullet", + "item.oldguns.guns.kark": "Kar98k", + "item.oldguns.guns.kark_barrel": "Kar98k Barrel", + "item.oldguns.guns.kark_body": "Kar98k Body", + "item.oldguns.guns.kark_stock": "Kar98k Stock", + "item.oldguns.guns.pirate_pistol": "Pirate Pistol", + "item.oldguns.guns.pirate_pistol_barrel": "Pirate Pistol Barrel", + "item.oldguns.guns.pirate_pistol_body": "Pirate Pistol Body", + "item.oldguns.guns.pirate_pistol_stock": "Pirate Pistol Handle", + "item.oldguns.guns.colt": "Colt1911", + "item.oldguns.guns.colt_barrel": "Colt1911 Barrel", + "item.oldguns.guns.colt_body": "Colt1911 Body", + "item.oldguns.guns.colt_handle": "Colt1911 Handle", + "item.oldguns.mags.colt_mag": "Colt1911 Mag", + "item.oldguns.guns.thompson": "Thompson", + "item.oldguns.guns.thompson_barrel": "Thompson Barrel", + "item.oldguns.guns.thompson_barrel_2": "Thompson Barrel 2", + "item.oldguns.guns.thompson_body": "Thompson Body", + "item.oldguns.guns.thompson_stock": "Thompson Stock", + "item.oldguns.mags.thompson_mag": "Thompson Mag", + "item.oldguns.mags.thompson_drum_mag": "Thompson Drum Mag", + "item.oldguns.guns.pirate_rifle": "Pirate Rifle", + "item.oldguns.guns.pirate_rifle_barrel": "Pirate Rifle Barrel", + "item.oldguns.guns.pirate_rifle_body": "Pirate Rifle Body", + "item.oldguns.guns.pirate_rifle_stock": "Pirate Rifle Handle", + "item.oldguns.guns.winchester_barrel": "Winchester Barrel", + "item.oldguns.guns.winchester_shotgun_barrel": "Winchester Shotgun Barrel", + "item.oldguns.guns.winchester_body": "Winchester Body", + "item.oldguns.guns.winchester_stock": "Winchester Stock", + "item.oldguns.guns.winchester": "Winchester", + "item.oldguns.guns.luger": "Luger P08", + "item.oldguns.guns.luger_barrel": "Luger P08 Barrel", + "item.oldguns.guns.luger_body": "Luger P08 Body", + "item.oldguns.guns.luger_handle": "Luger P08 Handle", + "item.oldguns.mags.luger_mag": "Luger P08 Mag", + "item.oldguns.guns.mp40": "Mp40", + "item.oldguns.guns.mp40_barrel": "Mp40 Barrel", + "item.oldguns.guns.mp40_body": "Mp40 Body", + "item.oldguns.guns.mp40_stock": "Mp40 Stock", + "item.oldguns.mags.mp40_mag": "Mp40 Mag", + "item.oldguns.guns.revolver": "Revolver", + "item.oldguns.guns.revolver_barrel": "Revolver Barrel", + "item.oldguns.guns.revolver_sb": "Revolver Shotgun Barrel", + "item.oldguns.guns.revolver_body": "Revolver Body", + "item.oldguns.guns.revolver_handle": "Revolver Handle", + "item.oldguns.guns.model37": "Model37", + "item.oldguns.guns.model37_barrel": "Model37 Barrel", + "item.oldguns.guns.model37_ext_barrel": "Model37 Extended Barrel", + "item.oldguns.guns.model37_body": "Model37 Body", + "item.oldguns.guns.model37_stock": "Model37 Stock", + "item.oldguns.guns.med_scope": "Scope", + "item.oldguns.steel_ingot": "Steel Ingot", + "item.oldguns.iron_with_coal": "Iron with coal", + "block.oldguns.gun_crafting_block": "Gun Crafting Block", + "block.oldguns.gun_parts_block": "Gun Parts Block", + "block.oldguns.gun_ammo_block": "Gun Ammo Block", + "block.oldguns.steel_block": "Steel Block", + "entity.oldguns.bullet": "Bullet", + "key.oldguns.reload": "Reload key", + "key.oldguns.attachments": "Attachments key", + "key.oldguns.kickback": "Stock Hit key", + "key.oldguns.inspectanim": "Inspection Animation key", + "itemGroup.oldguns": "JGGuns Tab", + "container.oldguns.gun_container": "Gun Inventory", + "container.oldguns.mag_container": "Mag Inventory", + "container.oldguns.gun_crafting_container": "Gun Crafting Inventory", + "container.oldguns.gun_parts_container": "Gun Parts Inventory", + "container.oldguns.gun_ammo_container": "Gun Ammo Inventory", + "gui.oldguns.gun_gui": "Gun GUI", + "gui.oldguns.mag_gui": "Mag GUI", + "gui.oldguns.gun_ammo_gui": "Gun Ammo GUI", + "gui.oldguns.gun_crafting_gui": "Gun Crafting GUI", + "gui.oldguns.gun_parts_gui": "Gun Parts GUI" +} \ No newline at end of file diff --git a/projects/1.16/assets/oldguns/oldguns/zh_cn.json b/projects/1.16/assets/oldguns/oldguns/zh_cn.json new file mode 100644 index 000000000000..7207b605bc5a --- /dev/null +++ b/projects/1.16/assets/oldguns/oldguns/zh_cn.json @@ -0,0 +1,79 @@ +{ + "item.oldguns.bullets.small_bullet": "小型子弹", + "item.oldguns.bullets.medium_bullet": "中型子弹", + "item.oldguns.bullets.big_bullet": "大型子弹", + "item.oldguns.bullets.musket_bullet": "滑膛枪子弹", + "item.oldguns.bullets.shotgun_bullet": "霰弹枪子弹", + "item.oldguns.guns.kark": "Kar98k", + "item.oldguns.guns.kark_barrel": "Kar98k枪管", + "item.oldguns.guns.kark_body": "Kar98k抢身", + "item.oldguns.guns.kark_stock": "Kar98k枪托", + "item.oldguns.guns.pirate_pistol": "海盗手枪", + "item.oldguns.guns.pirate_pistol_barrel": "海盗手枪枪管", + "item.oldguns.guns.pirate_pistol_body": "海盗手枪枪体", + "item.oldguns.guns.pirate_pistol_stock": "海盗手枪握把", + "item.oldguns.guns.colt": "柯尔特1911", + "item.oldguns.guns.colt_barrel": "柯尔特1911枪管", + "item.oldguns.guns.colt_body": "柯尔特1911枪体", + "item.oldguns.guns.colt_handle": "柯尔特1911握把", + "item.oldguns.mags.colt_mag": "柯尔特1911弹匣", + "item.oldguns.guns.thompson": "汤姆森", + "item.oldguns.guns.thompson_barrel": "汤姆森枪管", + "item.oldguns.guns.thompson_barrel_2": "汤姆森枪管 2", + "item.oldguns.guns.thompson_body": "汤姆森枪体", + "item.oldguns.guns.thompson_stock": "汤姆森枪托", + "item.oldguns.mags.thompson_mag": "汤姆森弹匣", + "item.oldguns.mags.thompson_drum_mag": "汤姆森弹鼓", + "item.oldguns.guns.pirate_rifle": "海盗步枪", + "item.oldguns.guns.pirate_rifle_barrel": "海盗步枪枪管", + "item.oldguns.guns.pirate_rifle_body": "海盗步枪枪体", + "item.oldguns.guns.pirate_rifle_stock": "海盗步枪握把", + "item.oldguns.guns.winchester_barrel": "温切斯特枪管", + "item.oldguns.guns.winchester_shotgun_barrel": "温切斯特霰弹枪枪管", + "item.oldguns.guns.winchester_body": "温切斯特枪体", + "item.oldguns.guns.winchester_stock": "温切斯特枪托", + "item.oldguns.guns.winchester": "温切斯特", + "item.oldguns.guns.luger": "鲁格尔P08", + "item.oldguns.guns.luger_barrel": "鲁格尔P08枪管", + "item.oldguns.guns.luger_body": "鲁格尔P08枪体", + "item.oldguns.guns.luger_handle": "鲁格尔P08握把", + "item.oldguns.mags.luger_mag": "鲁格尔P08弹匣", + "item.oldguns.guns.mp40": "Mp40", + "item.oldguns.guns.mp40_barrel": "Mp40枪管", + "item.oldguns.guns.mp40_body": "Mp40枪体", + "item.oldguns.guns.mp40_stock": "Mp40枪托", + "item.oldguns.mags.mp40_mag": "Mp40弹匣", + "item.oldguns.guns.revolver": "转轮手枪", + "item.oldguns.guns.revolver_barrel": "转轮手枪枪管", + "item.oldguns.guns.revolver_sb": "转轮霰弹枪枪管", + "item.oldguns.guns.revolver_body": "转轮手枪枪体", + "item.oldguns.guns.revolver_handle": "转轮手枪握把", + "item.oldguns.guns.model37": "伊萨卡37", + "item.oldguns.guns.model37_barrel": "伊萨卡37枪管", + "item.oldguns.guns.model37_ext_barrel": "伊萨卡37加长枪管", + "item.oldguns.guns.model37_body": "伊萨卡37枪体", + "item.oldguns.guns.model37_stock": "伊萨卡37枪托", + "item.oldguns.guns.med_scope": "瞄准镜", + "item.oldguns.steel_ingot": "钢锭", + "item.oldguns.iron_with_coal": "铁煤混合物", + "block.oldguns.gun_crafting_block": "制枪台", + "block.oldguns.gun_parts_block": "零件台", + "block.oldguns.gun_ammo_block": "弹药台", + "block.oldguns.steel_block": "钢块", + "entity.oldguns.bullet": "子弹", + "key.oldguns.reload": "重新装填", + "key.oldguns.attachments": "调整配件", + "key.oldguns.kickback": "枪托攻击", + "key.oldguns.inspectanim": "检视动画", + "itemGroup.oldguns": "JGGuns Tab", + "container.oldguns.gun_container": "枪械物品栏", + "container.oldguns.mag_container": "弹匣物品栏", + "container.oldguns.gun_crafting_container": "制枪台物品栏", + "container.oldguns.gun_parts_container": "零件台物品栏", + "container.oldguns.gun_ammo_container": "弹药台物品栏", + "gui.oldguns.gun_gui": "枪械GUI", + "gui.oldguns.mag_gui": "弹匣GUI", + "gui.oldguns.gun_ammo_gui": "枪械弹药GUI", + "gui.oldguns.gun_crafting_gui": "枪械合成GUI", + "gui.oldguns.gun_parts_gui": "GUI" +} \ No newline at end of file From e718b2c0c45cbaba060808d38f14b088d9fff918 Mon Sep 17 00:00:00 2001 From: mamaruo <37480168+mamaruo@users.noreply.github.com> Date: Sun, 27 Feb 2022 00:24:27 +0800 Subject: [PATCH 2/7] check --- projects/1.16/assets/oldguns/oldguns/en_us.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.16/assets/oldguns/oldguns/en_us.json b/projects/1.16/assets/oldguns/oldguns/en_us.json index ce341e1c41b5..a5e06c39329a 100644 --- a/projects/1.16/assets/oldguns/oldguns/en_us.json +++ b/projects/1.16/assets/oldguns/oldguns/en_us.json @@ -76,4 +76,4 @@ "gui.oldguns.gun_ammo_gui": "Gun Ammo GUI", "gui.oldguns.gun_crafting_gui": "Gun Crafting GUI", "gui.oldguns.gun_parts_gui": "Gun Parts GUI" -} \ No newline at end of file +} From 0103bbed7ce118b8668320dff89756d8b744f5f2 Mon Sep 17 00:00:00 2001 From: mamaruo <37480168+mamaruo@users.noreply.github.com> Date: Sun, 27 Feb 2022 01:24:19 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=B1=A4=E6=99=AE=E6=A3=AE=EF=BC=9B?= =?UTF-8?q?=E6=9E=AA=E6=A2=B0=E9=9B=B6=E4=BB=B6GUI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1.16/assets/oldguns/oldguns/zh_cn.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/projects/1.16/assets/oldguns/oldguns/zh_cn.json b/projects/1.16/assets/oldguns/oldguns/zh_cn.json index 7207b605bc5a..901db1d1497a 100644 --- a/projects/1.16/assets/oldguns/oldguns/zh_cn.json +++ b/projects/1.16/assets/oldguns/oldguns/zh_cn.json @@ -17,13 +17,13 @@ "item.oldguns.guns.colt_body": "柯尔特1911枪体", "item.oldguns.guns.colt_handle": "柯尔特1911握把", "item.oldguns.mags.colt_mag": "柯尔特1911弹匣", - "item.oldguns.guns.thompson": "汤姆森", - "item.oldguns.guns.thompson_barrel": "汤姆森枪管", - "item.oldguns.guns.thompson_barrel_2": "汤姆森枪管 2", - "item.oldguns.guns.thompson_body": "汤姆森枪体", - "item.oldguns.guns.thompson_stock": "汤姆森枪托", - "item.oldguns.mags.thompson_mag": "汤姆森弹匣", - "item.oldguns.mags.thompson_drum_mag": "汤姆森弹鼓", + "item.oldguns.guns.thompson": "汤普森", + "item.oldguns.guns.thompson_barrel": "汤普森枪管", + "item.oldguns.guns.thompson_barrel_2": "汤普森枪管 2", + "item.oldguns.guns.thompson_body": "汤普森枪体", + "item.oldguns.guns.thompson_stock": "汤普森枪托", + "item.oldguns.mags.thompson_mag": "汤普森弹匣", + "item.oldguns.mags.thompson_drum_mag": "汤普森弹鼓", "item.oldguns.guns.pirate_rifle": "海盗步枪", "item.oldguns.guns.pirate_rifle_barrel": "海盗步枪枪管", "item.oldguns.guns.pirate_rifle_body": "海盗步枪枪体", @@ -75,5 +75,5 @@ "gui.oldguns.mag_gui": "弹匣GUI", "gui.oldguns.gun_ammo_gui": "枪械弹药GUI", "gui.oldguns.gun_crafting_gui": "枪械合成GUI", - "gui.oldguns.gun_parts_gui": "GUI" -} \ No newline at end of file + "gui.oldguns.gun_parts_gui": "枪械零件GUI" +} From 6fb0e8635da21612540661757f29a6ceba406823 Mon Sep 17 00:00:00 2001 From: mamaruo <37480168+mamaruo@users.noreply.github.com> Date: Sun, 27 Feb 2022 17:59:33 +0800 Subject: [PATCH 4/7] =?UTF-8?q?fix=20=E6=8A=A2=E8=BA=AB=20=E6=9E=AA?= =?UTF-8?q?=E7=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/1.16/assets/oldguns/oldguns/zh_cn.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/1.16/assets/oldguns/oldguns/zh_cn.json b/projects/1.16/assets/oldguns/oldguns/zh_cn.json index 901db1d1497a..777e65255ae3 100644 --- a/projects/1.16/assets/oldguns/oldguns/zh_cn.json +++ b/projects/1.16/assets/oldguns/oldguns/zh_cn.json @@ -6,7 +6,7 @@ "item.oldguns.bullets.shotgun_bullet": "霰弹枪子弹", "item.oldguns.guns.kark": "Kar98k", "item.oldguns.guns.kark_barrel": "Kar98k枪管", - "item.oldguns.guns.kark_body": "Kar98k抢身", + "item.oldguns.guns.kark_body": "Kar98枪身", "item.oldguns.guns.kark_stock": "Kar98k枪托", "item.oldguns.guns.pirate_pistol": "海盗手枪", "item.oldguns.guns.pirate_pistol_barrel": "海盗手枪枪管", @@ -29,7 +29,7 @@ "item.oldguns.guns.pirate_rifle_body": "海盗步枪枪体", "item.oldguns.guns.pirate_rifle_stock": "海盗步枪握把", "item.oldguns.guns.winchester_barrel": "温切斯特枪管", - "item.oldguns.guns.winchester_shotgun_barrel": "温切斯特霰弹枪枪管", + "item.oldguns.guns.winchester_shotgun_barrel": "温切斯特霰弹枪管", "item.oldguns.guns.winchester_body": "温切斯特枪体", "item.oldguns.guns.winchester_stock": "温切斯特枪托", "item.oldguns.guns.winchester": "温切斯特", @@ -45,7 +45,7 @@ "item.oldguns.mags.mp40_mag": "Mp40弹匣", "item.oldguns.guns.revolver": "转轮手枪", "item.oldguns.guns.revolver_barrel": "转轮手枪枪管", - "item.oldguns.guns.revolver_sb": "转轮霰弹枪枪管", + "item.oldguns.guns.revolver_sb": "转轮霰弹枪管", "item.oldguns.guns.revolver_body": "转轮手枪枪体", "item.oldguns.guns.revolver_handle": "转轮手枪握把", "item.oldguns.guns.model37": "伊萨卡37", From 918b7eff6831c940624d40704975d3bdb5c20c53 Mon Sep 17 00:00:00 2001 From: mamaruo <37480168+mamaruo@users.noreply.github.com> Date: Sun, 27 Feb 2022 18:00:27 +0800 Subject: [PATCH 5/7] fix k --- projects/1.16/assets/oldguns/oldguns/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.16/assets/oldguns/oldguns/zh_cn.json b/projects/1.16/assets/oldguns/oldguns/zh_cn.json index 777e65255ae3..20e598e974b3 100644 --- a/projects/1.16/assets/oldguns/oldguns/zh_cn.json +++ b/projects/1.16/assets/oldguns/oldguns/zh_cn.json @@ -6,7 +6,7 @@ "item.oldguns.bullets.shotgun_bullet": "霰弹枪子弹", "item.oldguns.guns.kark": "Kar98k", "item.oldguns.guns.kark_barrel": "Kar98k枪管", - "item.oldguns.guns.kark_body": "Kar98枪身", + "item.oldguns.guns.kark_body": "Kar98k枪身", "item.oldguns.guns.kark_stock": "Kar98k枪托", "item.oldguns.guns.pirate_pistol": "海盗手枪", "item.oldguns.guns.pirate_pistol_barrel": "海盗手枪枪管", From 46824fceb5ffd788d3a0d6c0fe4574b695897fff Mon Sep 17 00:00:00 2001 From: mamaruo <37480168+mamaruo@users.noreply.github.com> Date: Tue, 1 Mar 2022 00:11:25 +0800 Subject: [PATCH 6/7] mod name --- projects/1.16/assets/oldguns/oldguns/zh_cn.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/1.16/assets/oldguns/oldguns/zh_cn.json b/projects/1.16/assets/oldguns/oldguns/zh_cn.json index 20e598e974b3..ced475b91b72 100644 --- a/projects/1.16/assets/oldguns/oldguns/zh_cn.json +++ b/projects/1.16/assets/oldguns/oldguns/zh_cn.json @@ -65,7 +65,7 @@ "key.oldguns.attachments": "调整配件", "key.oldguns.kickback": "枪托攻击", "key.oldguns.inspectanim": "检视动画", - "itemGroup.oldguns": "JGGuns Tab", + "itemGroup.oldguns": "JGGuns（OldGuns）", "container.oldguns.gun_container": "枪械物品栏", "container.oldguns.mag_container": "弹匣物品栏", "container.oldguns.gun_crafting_container": "制枪台物品栏", From 33976b5025156c61ec893ba8c4b7013381be34a4 Mon Sep 17 00:00:00 2001 From: mamaruo Date: Wed, 2 Mar 2022 00:05:14 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E8=BD=AC=E8=BD=AE->=E5=B7=A6=E8=BD=AE?= =?UTF-8?q?=EF=BC=9B=E6=B1=A4=E5=A7=86=E6=A3=AE=E6=9E=AA=E7=AE=A1II?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/1.16/assets/oldguns/oldguns/zh_cn.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/1.16/assets/oldguns/oldguns/zh_cn.json b/projects/1.16/assets/oldguns/oldguns/zh_cn.json index ced475b91b72..2756fee93d10 100644 --- a/projects/1.16/assets/oldguns/oldguns/zh_cn.json +++ b/projects/1.16/assets/oldguns/oldguns/zh_cn.json @@ -19,7 +19,7 @@ "item.oldguns.mags.colt_mag": "柯尔特1911弹匣", "item.oldguns.guns.thompson": "汤普森", "item.oldguns.guns.thompson_barrel": "汤普森枪管", - "item.oldguns.guns.thompson_barrel_2": "汤普森枪管 2", + "item.oldguns.guns.thompson_barrel_2": "汤普森枪管II型", "item.oldguns.guns.thompson_body": "汤普森枪体", "item.oldguns.guns.thompson_stock": "汤普森枪托", "item.oldguns.mags.thompson_mag": "汤普森弹匣", @@ -43,11 +43,11 @@ "item.oldguns.guns.mp40_body": "Mp40枪体", "item.oldguns.guns.mp40_stock": "Mp40枪托", "item.oldguns.mags.mp40_mag": "Mp40弹匣", - "item.oldguns.guns.revolver": "转轮手枪", - "item.oldguns.guns.revolver_barrel": "转轮手枪枪管", - "item.oldguns.guns.revolver_sb": "转轮霰弹枪管", - "item.oldguns.guns.revolver_body": "转轮手枪枪体", - "item.oldguns.guns.revolver_handle": "转轮手枪握把", + "item.oldguns.guns.revolver": "左轮手枪", + "item.oldguns.guns.revolver_barrel": "左轮手枪枪管", + "item.oldguns.guns.revolver_sb": "左轮霰弹枪管", + "item.oldguns.guns.revolver_body": "左轮手枪枪体", + "item.oldguns.guns.revolver_handle": "左轮手枪握把", "item.oldguns.guns.model37": "伊萨卡37", "item.oldguns.guns.model37_barrel": "伊萨卡37枪管", "item.oldguns.guns.model37_ext_barrel": "伊萨卡37加长枪管",