From 22da60a890a38f4f772b078f908227a3109faec3 Mon Sep 17 00:00:00 2001 From: Jiahe Yan Date: Tue, 11 Nov 2025 18:10:28 +0800 Subject: [PATCH 1/5] init --- projects/1.21/assets/gag/gag/lang/en_us.json | 56 ++++++++++++++++++++ projects/1.21/assets/gag/gag/lang/zh_cn.json | 56 ++++++++++++++++++++ 2 files changed, 112 insertions(+) create mode 100644 projects/1.21/assets/gag/gag/lang/en_us.json create mode 100644 projects/1.21/assets/gag/gag/lang/zh_cn.json diff --git a/projects/1.21/assets/gag/gag/lang/en_us.json b/projects/1.21/assets/gag/gag/lang/en_us.json new file mode 100644 index 000000000000..d617e1fe5780 --- /dev/null +++ b/projects/1.21/assets/gag/gag/lang/en_us.json @@ -0,0 +1,56 @@ +{ + "block.gag.fluid_proxy": "Fluid Proxy", + "block.gag.item_proxy": "Item Proxy", + "block.gag.no_solicitors": "'No Solicitors!' Sign", + "block.gag.no_solicitors.info.1": "Wards off certain pesky intruders within a reasonable area.", + "block.gag.no_solicitors.info.2": "(Right-click with wool to toggle silent mode)", + "block.gag.no_solicitors.silent": "Silent Mode: %s", + "commands.gag.give_time.no_pouch": "%s does not have a temporal pouch in their inventory!", + "commands.gag.give_time.success": "Successfully gave %s ticks worth of time to %s", + "effect.gag.repelling": "Repelling", + "features.gag.capability_proxy": "Capability Proxies (GAG)", + "info.gag.lightning_crafting_hint": "Strike with Lightning", + "info.gag.repelling_item": "When applied, gives the player an effect that stops nearby hostile mobs from spawning.", + "info.gag.supports_unbreaking": "(can be enchanted with Unbreaking and Mending)", + "item.gag.energized_hearthstone": "Energized Hearthstone", + "item.gag.escape_rope": "Escape Rope", + "item.gag.escape_rope.info": "Teleports a player out of caves and buildings to the nearest point on the surface.", + "item.gag.escape_rope.no_space": "Could not find any space on the surface to teleport to.", + "item.gag.fishing_dynamite": "Fishing Dynamite", + "item.gag.fishing_dynamite.info": "Throwable explosive that only works underwater and deals increased damage to fish. Perfect if you don't like fishing!", + "item.gag.hearthstone": "Hearthstone", + "item.gag.hearthstone.info": "Teleports a player to their personal spawn point, or, if enabled, the world spawn.", + "item.gag.hearthstone.info_adv": "A stronger hearthstone that has channelled the energy of raw lightning, and can be used to teleport to a single bound location. You can reset the stone by hitting it with lightning again.", + "item.gag.hearthstone.no_target": "Couldn't find anywhere to teleport to, did you set your spawn point?", + "item.gag.hearthstone.target.bound": "🧭 %s", + "item.gag.hearthstone.target.hidden": "[hidden target]", + "item.gag.hearthstone.target.respawn": "Your Respawn Point", + "item.gag.hearthstone.target.unbound": "🧭 Unbound", + "item.gag.hearthstone.too_weak": "It seems this hearthstone is too weak to call home from this place.", + "item.gag.hearthstone.warmup": "Teleporting in %s seconds...", + "item.gag.labeling_tool": "Labeling Tool", + "item.gag.labeling_tool.info": "Used to change the name of any item in your inventory at no cost.", + "item.gag.labeling_tool.text_box": "Rename Item", + "item.gag.mining_dynamite": "Mining Dynamite", + "item.gag.mining_dynamite.info": "Throwable explosive that has a high efficiency against stone. Drops all blocks it destroys.", + "item.gag.pigment_jar": "Pigment Jar", + "item.gag.pigment_jar.contents": "Contains %s charges of %s", + "item.gag.pigment_jar.contents.empty": "Empty", + "item.gag.pigment_jar.info.empty.1": "An empty jar used to store pigments. Probably needs to be filled to be useful.", + "item.gag.pigment_jar.info.empty.2": "Hint: Grind up some dye with flint, then add some milk.", + "item.gag.pigment_jar.info.filled.1": "Can be used in a labeling tool to change the color of the item's name.", + "item.gag.pigment_jar.info.filled.2": "Hint: Combine with other pigment jars to mix colors.", + "item.gag.sacred_balm": "Sacred Balm", + "item.gag.sacred_balm.extra": "Lasts considerably longer than either the salt or salve, but has a reduced radius.", + "item.gag.sacred_salt": "Sacred Salt", + "item.gag.sacred_salve": "Sacred Salve", + "item.gag.sacred_salve.extra": "Lasts a bit longer than the salt, and also works in a larger area.", + "item.gag.time_sand_pouch": "Temporal Pouch", + "item.gag.time_sand_pouch.info": "Slowly accumulates time while in a player's inventory. Use on a ticking block to accelerate it, using some of the stored time from the pouch.", + "item.gag.time_sand_pouch.info.stored_grains": "Contains %2$s worth of Grains of Time", + "itemGroup.gag.gag": "GAG — Gadgets Against Grind", + "subtitles.gag.entity.dynamite.throw": "Dynamite thrown", + "subtitles.gag.item.repelling.apply": "Repelling item applied", + "subtitles.gag.item.time_sand_pouch.ding": "Block tick accelerated", + "subtitles.gag.item.time_sand_pouch.dong": "Block tick accelerated to very high speed" +} \ No newline at end of file diff --git a/projects/1.21/assets/gag/gag/lang/zh_cn.json b/projects/1.21/assets/gag/gag/lang/zh_cn.json new file mode 100644 index 000000000000..9be48312491d --- /dev/null +++ b/projects/1.21/assets/gag/gag/lang/zh_cn.json @@ -0,0 +1,56 @@ +{ + "block.gag.fluid_proxy": "Fluid Proxy", + "block.gag.item_proxy": "Item Proxy", + "block.gag.no_solicitors": "“游人止步！”告示牌", + "block.gag.no_solicitors.info.1": "在合理范围内驱逐某些讨厌的入侵者。", + "block.gag.no_solicitors.info.2": "（右击使用羊毛切换静音模式）", + "block.gag.no_solicitors.silent": "静音模式：%s", + "commands.gag.give_time.no_pouch": "%s的物品栏中没有时间之袋！", + "commands.gag.give_time.success": "成功将%s刻时间给予%s", + "effect.gag.repelling": "驱散", + "features.gag.capability_proxy": "Capability Proxies (GAG)", + "info.gag.lightning_crafting_hint": "用闪电击中", + "info.gag.repelling_item": "使用后，给予玩家一个阻止附近的敌对生物生成的效果。", + "info.gag.supports_unbreaking": "（接受耐久与经验修补魔咒）", + "item.gag.energized_hearthstone": "充能炉石", + "item.gag.escape_rope": "逃生绳", + "item.gag.escape_rope.info": "将玩家从洞穴或建筑物中传送到最近的地面上。", + "item.gag.escape_rope.no_space": "无法在地面上找到合适的空间进行传送。", + "item.gag.fishing_dynamite": "捕鱼炸药", + "item.gag.fishing_dynamite.info": "只能在水下使用的可投掷爆炸物，对鱼类造成成倍伤害。如果你不喜欢钓鱼，这将是完美的选择！", + "item.gag.hearthstone": "炉石", + "item.gag.hearthstone.info": "将玩家传送至重生点，或传送至世界重生点。", + "item.gag.hearthstone.info_adv": "一块更强的炉石，它汇聚了原始闪电的能量，可以用于传送到一个固定的绑定位置。再次用闪电击中它即可重置绑定。", + "item.gag.hearthstone.no_target": "找不到可以传送的地点，你是否已设置重生点？", + "item.gag.hearthstone.target.bound": "🧭 %s", + "item.gag.hearthstone.target.hidden": "[hidden target]", + "item.gag.hearthstone.target.respawn": "你的重生点", + "item.gag.hearthstone.target.unbound": "🧭 Unbound", + "item.gag.hearthstone.too_weak": "这块炉石似乎太弱了，无法进行传送。", + "item.gag.hearthstone.warmup": "将于%s秒后传送……", + "item.gag.labeling_tool": "标记工具", + "item.gag.labeling_tool.info": "免费更改您物品栏中任何物品的名称。", + "item.gag.labeling_tool.text_box": "重命名物品", + "item.gag.mining_dynamite": "采矿炸药", + "item.gag.mining_dynamite.info": "可投掷的爆炸物，可以高效地摧毁石头。被摧毁的所有方块都会掉落。", + "item.gag.pigment_jar": "颜料罐", + "item.gag.pigment_jar.contents": "可使用%s次%s", + "item.gag.pigment_jar.contents.empty": "空", + "item.gag.pigment_jar.info.empty.1": "用于储存颜料的空罐子。可能需要装满才能使用。", + "item.gag.pigment_jar.info.empty.2": "提示：用燧石研磨染料，然后加入奶。", + "item.gag.pigment_jar.info.filled.1": "可以在标记工具中使用以改变物品名称的颜色。", + "item.gag.pigment_jar.info.filled.2": "提示：与其他颜料罐混合以调配颜色。", + "item.gag.sacred_balm": "神圣香油", + "item.gag.sacred_balm.extra": "比神圣之盐或神圣药膏的持续时间要长得多，但作用范围减小了。", + "item.gag.sacred_salt": "神圣之盐", + "item.gag.sacred_salve": "神圣药膏", + "item.gag.sacred_salve.extra": "比神圣之盐的持续时间稍长，作用范围也更大。", + "item.gag.time_sand_pouch": "时间之袋", + "item.gag.time_sand_pouch.info": "在玩家的物品栏中缓慢存储时间颗粒。右击工作中的方块，消耗袋中存储的时间颗粒以加速其运行。", + "item.gag.time_sand_pouch.info.stored_grains": "已存储%2$s的时间颗粒", + "itemGroup.gag.gag": "GAG — Gadgets Against Grind", + "subtitles.gag.entity.dynamite.throw": "炸药：飞出", + "subtitles.gag.item.repelling.apply": "驱散：使用", + "subtitles.gag.item.time_sand_pouch.ding": "Block tick accelerated", + "subtitles.gag.item.time_sand_pouch.dong": "Block tick accelerated to very high speed" +} \ No newline at end of file From 1b351e3399b0de6b4db9ec170b53edab88f238ff Mon Sep 17 00:00:00 2001 From: Jiahe Yan Date: Sun, 16 Nov 2025 01:05:09 +0800 Subject: [PATCH 2/5] done --- projects/1.21/assets/gag/gag/lang/zh_cn.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/projects/1.21/assets/gag/gag/lang/zh_cn.json b/projects/1.21/assets/gag/gag/lang/zh_cn.json index 9be48312491d..ed84c830850a 100644 --- a/projects/1.21/assets/gag/gag/lang/zh_cn.json +++ b/projects/1.21/assets/gag/gag/lang/zh_cn.json @@ -1,6 +1,6 @@ { - "block.gag.fluid_proxy": "Fluid Proxy", - "block.gag.item_proxy": "Item Proxy", + "block.gag.fluid_proxy": "流体代理", + "block.gag.item_proxy": "物品代理", "block.gag.no_solicitors": "“游人止步！”告示牌", "block.gag.no_solicitors.info.1": "在合理范围内驱逐某些讨厌的入侵者。", "block.gag.no_solicitors.info.2": "（右击使用羊毛切换静音模式）", @@ -8,8 +8,8 @@ "commands.gag.give_time.no_pouch": "%s的物品栏中没有时间之袋！", "commands.gag.give_time.success": "成功将%s刻时间给予%s", "effect.gag.repelling": "驱散", - "features.gag.capability_proxy": "Capability Proxies (GAG)", - "info.gag.lightning_crafting_hint": "用闪电击中", + "features.gag.capability_proxy": "功能代理（GAG）", + "info.gag.lightning_crafting_hint": "雷击", "info.gag.repelling_item": "使用后，给予玩家一个阻止附近的敌对生物生成的效果。", "info.gag.supports_unbreaking": "（接受耐久与经验修补魔咒）", "item.gag.energized_hearthstone": "充能炉石", @@ -23,9 +23,9 @@ "item.gag.hearthstone.info_adv": "一块更强的炉石，它汇聚了原始闪电的能量，可以用于传送到一个固定的绑定位置。再次用闪电击中它即可重置绑定。", "item.gag.hearthstone.no_target": "找不到可以传送的地点，你是否已设置重生点？", "item.gag.hearthstone.target.bound": "🧭 %s", - "item.gag.hearthstone.target.hidden": "[hidden target]", + "item.gag.hearthstone.target.hidden": "[目标已隐藏]", "item.gag.hearthstone.target.respawn": "你的重生点", - "item.gag.hearthstone.target.unbound": "🧭 Unbound", + "item.gag.hearthstone.target.unbound": "🧭 当前未绑定", "item.gag.hearthstone.too_weak": "这块炉石似乎太弱了，无法进行传送。", "item.gag.hearthstone.warmup": "将于%s秒后传送……", "item.gag.labeling_tool": "标记工具", @@ -51,6 +51,6 @@ "itemGroup.gag.gag": "GAG — Gadgets Against Grind", "subtitles.gag.entity.dynamite.throw": "炸药：飞出", "subtitles.gag.item.repelling.apply": "驱散：使用", - "subtitles.gag.item.time_sand_pouch.ding": "Block tick accelerated", - "subtitles.gag.item.time_sand_pouch.dong": "Block tick accelerated to very high speed" + "subtitles.gag.item.time_sand_pouch.ding": "方块刻：加速", + "subtitles.gag.item.time_sand_pouch.dong": "方块刻：超级加速" } \ No newline at end of file From e3af865152fd76173648863ea3092aee2d1c1695 Mon Sep 17 00:00:00 2001 From: Jiahe Yan Date: Sat, 29 Nov 2025 23:39:34 +0800 Subject: [PATCH 3/5] sync to latest ver. --- projects/1.21/assets/gag/gag/lang/en_us.json | 12 ++++++++++++ projects/1.21/assets/gag/gag/lang/zh_cn.json | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/projects/1.21/assets/gag/gag/lang/en_us.json b/projects/1.21/assets/gag/gag/lang/en_us.json index d617e1fe5780..2069fc79ed07 100644 --- a/projects/1.21/assets/gag/gag/lang/en_us.json +++ b/projects/1.21/assets/gag/gag/lang/en_us.json @@ -46,6 +46,18 @@ "item.gag.sacred_salve": "Sacred Salve", "item.gag.sacred_salve.extra": "Lasts a bit longer than the salt, and also works in a larger area.", "item.gag.time_sand_pouch": "Temporal Pouch", + "item.gag.time_sand_pouch.flavour": [ + { + "extra": [ + { + "strikethrough": true, + "text": "bottle" + }, + " bundle..." + ], + "text": "If I could save time in a " + } + ], "item.gag.time_sand_pouch.info": "Slowly accumulates time while in a player's inventory. Use on a ticking block to accelerate it, using some of the stored time from the pouch.", "item.gag.time_sand_pouch.info.stored_grains": "Contains %2$s worth of Grains of Time", "itemGroup.gag.gag": "GAG — Gadgets Against Grind", diff --git a/projects/1.21/assets/gag/gag/lang/zh_cn.json b/projects/1.21/assets/gag/gag/lang/zh_cn.json index ed84c830850a..6f98a3d9d504 100644 --- a/projects/1.21/assets/gag/gag/lang/zh_cn.json +++ b/projects/1.21/assets/gag/gag/lang/zh_cn.json @@ -46,6 +46,18 @@ "item.gag.sacred_salve": "神圣药膏", "item.gag.sacred_salve.extra": "比神圣之盐的持续时间稍长，作用范围也更大。", "item.gag.time_sand_pouch": "时间之袋", + "item.gag.time_sand_pouch.flavour": [ + { + "extra": [ + { + "strikethrough": true, + "text": "瓶子" + }, + "袋子中……" + ], + "text": "如果我能把时间装入一个" + } + ], "item.gag.time_sand_pouch.info": "在玩家的物品栏中缓慢存储时间颗粒。右击工作中的方块，消耗袋中存储的时间颗粒以加速其运行。", "item.gag.time_sand_pouch.info.stored_grains": "已存储%2$s的时间颗粒", "itemGroup.gag.gag": "GAG — Gadgets Against Grind", From 8e3f621156205127b65de7fe9b213642efc4cf1f Mon Sep 17 00:00:00 2001 From: Jiahe Yan Date: Tue, 2 Dec 2025 16:37:30 +0800 Subject: [PATCH 4/5] Apply suggestions from code review Co-authored-by: ZetaY <34602681+ZHAY10086@users.noreply.github.com> --- projects/1.21/assets/gag/gag/lang/zh_cn.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/projects/1.21/assets/gag/gag/lang/zh_cn.json b/projects/1.21/assets/gag/gag/lang/zh_cn.json index 6f98a3d9d504..c7196e95a5cb 100644 --- a/projects/1.21/assets/gag/gag/lang/zh_cn.json +++ b/projects/1.21/assets/gag/gag/lang/zh_cn.json @@ -3,7 +3,7 @@ "block.gag.item_proxy": "物品代理", "block.gag.no_solicitors": "“游人止步！”告示牌", "block.gag.no_solicitors.info.1": "在合理范围内驱逐某些讨厌的入侵者。", - "block.gag.no_solicitors.info.2": "（右击使用羊毛切换静音模式）", + "block.gag.no_solicitors.info.2": "（使用羊毛右击切换静音模式）", "block.gag.no_solicitors.silent": "静音模式：%s", "commands.gag.give_time.no_pouch": "%s的物品栏中没有时间之袋！", "commands.gag.give_time.success": "成功将%s刻时间给予%s", @@ -17,19 +17,19 @@ "item.gag.escape_rope.info": "将玩家从洞穴或建筑物中传送到最近的地面上。", "item.gag.escape_rope.no_space": "无法在地面上找到合适的空间进行传送。", "item.gag.fishing_dynamite": "捕鱼炸药", - "item.gag.fishing_dynamite.info": "只能在水下使用的可投掷爆炸物，对鱼类造成成倍伤害。如果你不喜欢钓鱼，这将是完美的选择！", + "item.gag.fishing_dynamite.info": "只能在水下使用的可投掷爆炸物，对鱼类造成额外伤害。如果你不喜欢钓鱼，这将是完美的选择！", "item.gag.hearthstone": "炉石", - "item.gag.hearthstone.info": "将玩家传送至重生点，或传送至世界重生点。", + "item.gag.hearthstone.info": "将玩家传送至其个人出生点，或传送至世界出生点。", "item.gag.hearthstone.info_adv": "一块更强的炉石，它汇聚了原始闪电的能量，可以用于传送到一个固定的绑定位置。再次用闪电击中它即可重置绑定。", "item.gag.hearthstone.no_target": "找不到可以传送的地点，你是否已设置重生点？", "item.gag.hearthstone.target.bound": "🧭 %s", "item.gag.hearthstone.target.hidden": "[目标已隐藏]", "item.gag.hearthstone.target.respawn": "你的重生点", "item.gag.hearthstone.target.unbound": "🧭 当前未绑定", - "item.gag.hearthstone.too_weak": "这块炉石似乎太弱了，无法进行传送。", + "item.gag.hearthstone.too_weak": "炉石的力量似乎过于微弱，无法从此传送回家。", "item.gag.hearthstone.warmup": "将于%s秒后传送……", "item.gag.labeling_tool": "标记工具", - "item.gag.labeling_tool.info": "免费更改您物品栏中任何物品的名称。", + "item.gag.labeling_tool.info": "无需消耗便可为物品栏中的任何物品重命名。", "item.gag.labeling_tool.text_box": "重命名物品", "item.gag.mining_dynamite": "采矿炸药", "item.gag.mining_dynamite.info": "可投掷的爆炸物，可以高效地摧毁石头。被摧毁的所有方块都会掉落。", @@ -58,11 +58,11 @@ "text": "如果我能把时间装入一个" } ], - "item.gag.time_sand_pouch.info": "在玩家的物品栏中缓慢存储时间颗粒。右击工作中的方块，消耗袋中存储的时间颗粒以加速其运行。", + "item.gag.time_sand_pouch.info": "在玩家的物品栏中缓慢积蓄时间。右击工作中的方块，消耗袋中存储的时间以加速其运行。", "item.gag.time_sand_pouch.info.stored_grains": "已存储%2$s的时间颗粒", "itemGroup.gag.gag": "GAG — Gadgets Against Grind", - "subtitles.gag.entity.dynamite.throw": "炸药：飞出", - "subtitles.gag.item.repelling.apply": "驱散：使用", + "subtitles.gag.entity.dynamite.throw": "炸药：扔出", + "subtitles.gag.item.repelling.apply": "驱散物品：使用", "subtitles.gag.item.time_sand_pouch.ding": "方块刻：加速", "subtitles.gag.item.time_sand_pouch.dong": "方块刻：超级加速" } \ No newline at end of file From 90953a138f936e1cc4fd4c2fe8233904d1a3cad9 Mon Sep 17 00:00:00 2001 From: Jiahe Yan Date: Tue, 2 Dec 2025 17:17:42 +0800 Subject: [PATCH 5/5] =?UTF-8?q?`=E9=87=8D=E7=94=9F=E7=82=B9`=20->=20`?= =?UTF-8?q?=E5=87=BA=E7=94=9F=E7=82=B9`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- projects/1.21/assets/gag/gag/lang/zh_cn.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/1.21/assets/gag/gag/lang/zh_cn.json b/projects/1.21/assets/gag/gag/lang/zh_cn.json index c7196e95a5cb..af3d2ede2774 100644 --- a/projects/1.21/assets/gag/gag/lang/zh_cn.json +++ b/projects/1.21/assets/gag/gag/lang/zh_cn.json @@ -21,10 +21,10 @@ "item.gag.hearthstone": "炉石", "item.gag.hearthstone.info": "将玩家传送至其个人出生点，或传送至世界出生点。", "item.gag.hearthstone.info_adv": "一块更强的炉石，它汇聚了原始闪电的能量，可以用于传送到一个固定的绑定位置。再次用闪电击中它即可重置绑定。", - "item.gag.hearthstone.no_target": "找不到可以传送的地点，你是否已设置重生点？", + "item.gag.hearthstone.no_target": "找不到可以传送的地点，你是否已设置出生点？", "item.gag.hearthstone.target.bound": "🧭 %s", "item.gag.hearthstone.target.hidden": "[目标已隐藏]", - "item.gag.hearthstone.target.respawn": "你的重生点", + "item.gag.hearthstone.target.respawn": "你的出生点", "item.gag.hearthstone.target.unbound": "🧭 当前未绑定", "item.gag.hearthstone.too_weak": "炉石的力量似乎过于微弱，无法从此传送回家。", "item.gag.hearthstone.warmup": "将于%s秒后传送……",