Merge pull request EnigmaticaModpacks#5437 from ZZZank/more_localization

fix EnigmaticaModpacks#5379
MuteTiefling · Jan 23, 2024 · 934297b · 934297b
2 parents a178964 + 982957f
commit 934297b
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 12 deletions.
diff --git a/kubejs/assets/enigmatica/lang/en_us.json b/kubejs/assets/enigmatica/lang/en_us.json
@@ -42,6 +42,19 @@
     "desc.immersiveengineering.info.mineral.horodric_digsite": "Horodric Digsite",
     "desc.immersiveengineering.info.mineral.naqada": "Naqada",
 
+    "desc.enigmatica.ie_multiblock_error": "Invalid structure or missing gamestage. Double check the structure and/or obtain the appropriate Machinery Schematic to be able to form this multiblock.",
+    "desc.enigmatica.amadron.atum_mineral": "Atum Mineral Survey",
+    "desc.enigmatica.amadron.atum_mineral.lore": "A collection of minerals from Atum.",
+    "desc.enigmatica.amadron.undergarden_mineral": "Undergarden Mineral Survey",
+    "desc.enigmatica.amadron.undergarden_mineral.lore": "A collection of minerals from the Undergarden.",
+    "desc.enigmatica.amadron.nether_botanical": "Nether Botanical Survey",
+    "desc.enigmatica.amadron.nether_botanical.lore": "A collection of botanical samples from the Nether.",
+    "desc.enigmatica.amadron.end_botanical": "End Botanical Survey",
+    "desc.enigmatica.amadron.end_botanical.lore": "A collection of botanical samples from the End.",
+    "desc.enigmatica.amadron.end_mineral": "End Mineral Survey",
+    "desc.enigmatica.amadron.end_mineral.lore": "A collection of minerals from the End.",
+    "desc.enigmatica.": "",
+
     "ars_nouveau.school.blood": "Blood",
 
     "advancements.enigmatica.husbandry.tame_all_animals.title": "Zoology",

diff --git a/kubejs/assets/enigmatica/lang/zh_cn.json b/kubejs/assets/enigmatica/lang/zh_cn.json
@@ -33,6 +33,18 @@
     "desc.immersiveengineering.info.mineral.horodric_digsite": "沙民遗迹",
     "desc.immersiveengineering.info.mineral.naqada": "奈布矿脉",
     "ars_nouveau.school.blood": "血",
+    "desc.enigmatica.ie_multiblock_error": "结构无效或者缺少对应游戏阶段。请检查结构是否正确，所需的机械蓝图是否已经获得。",
+    "desc.enigmatica.amadron.atum_mineral": "阿图姆矿物勘测",
+    "desc.enigmatica.amadron.atum_mineral.lore": "一批来自阿图姆的矿物。",
+    "desc.enigmatica.amadron.undergarden_mineral": "深园矿物勘测",
+    "desc.enigmatica.amadron.undergarden_mineral.lore": "一批来自深园的矿物。",
+    "desc.enigmatica.amadron.nether_botanical": "下界植物勘测",
+    "desc.enigmatica.amadron.nether_botanical.lore": "一批来自下界的植物样本。",
+    "desc.enigmatica.amadron.end_botanical": "末地植物勘测",
+    "desc.enigmatica.amadron.end_botanical.lore": "一批来自末地的植物样本。",
+    "desc.enigmatica.amadron.end_mineral": "末地矿物勘测",
+    "desc.enigmatica.amadron.end_mineral.lore": "一批来自末地的矿物。",
+    "desc.enigmatica.": "",
     "advancements.enigmatica.husbandry.tame_all_animals.title": "动物大师",
     "advancements.enigmatica.husbandry.tame_all_animals.description": "驯服所有可驯服的动物！",
     "block.naturesaura.infused_iron_block": "灌注耀阳金属块",

diff --git a/kubejs/assets/kubejs/lang/en_us.json b/kubejs/assets/kubejs/lang/en_us.json
@@ -11,6 +11,9 @@
     "item.kubejs.scavengers_delight": "Scavenger's Delight",
     "item.kubejs.alchemists_delight": "Alchemist's Delight",
 
+    "item.kubejs.fisher_foliot": "Fisher Foliot",
+    "item.kubejs.miner_marid_irradiated": "Irradiated Ore Miner Marid",
+    "item.kubejs.meat_ingot": "Meat Ingot",
     "item.kubejs.altered_recipe_indicator": "Altered Recipe",
     "item.kubejs.disabled_recipe_indicator": "Disabled Recipe",
     "item.kubejs.observatory_lens": "Observatory Lens",

diff --git a/kubejs/assets/kubejs/lang/zh_cn.json b/kubejs/assets/kubejs/lang/zh_cn.json
@@ -9,6 +9,9 @@
     "item.kubejs.blacksmiths_delight": "铁匠快乐包",
     "item.kubejs.scavengers_delight": "拾荒者快乐包",
     "item.kubejs.alchemists_delight": "炼金术师快乐包",
+    "item.kubejs.fisher_foliot": "渔夫魔精",
+    "item.kubejs.miner_marid_irradiated": "辐照掘矿者魔王",
+    "item.kubejs.meat_ingot": "肉锭",
     "item.kubejs.altered_recipe_indicator": "已改变的配方",
     "item.kubejs.disabled_recipe_indicator": "已禁用的配方",
     "item.kubejs.observatory_lens": "观星透镜",

diff --git a/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/pneumaticcraft/amadron.js b/kubejs/server_scripts/enigmatica/kubejs/base/recipetypes/pneumaticcraft/amadron.js
@@ -10,7 +10,13 @@ onEvent('recipes', (event) => {
                 type: 'ITEM',
                 id: 'pneumaticcraft:reinforced_chest',
                 amount: 1,
-                nbt: `{display:{Name:'[{"text":"Atum Mineral Survey"}]',Lore:['[{"text":"A collection of minerals from Atum.","color":"gold"}]']},BlockEntityTag:{LootTable:"enigmatica:chests/amadron_mineral_survey_atum_combo"}}`
+                nbt: JSON.stringify({
+                    display: {
+                        Name: '[{ "translate": "desc.enigmatica.amadron.atum_mineral" }]',
+                        Lore: ['[{ "translate": "desc.enigmatica.amadron.atum_mineral.lore", "color": "gold" }]']
+                    },
+                    BlockEntityTag: { LootTable: 'enigmatica:chests/amadron_mineral_survey_atum_combo' }
+                })
             },
             level: 0,
             maxStock: 5,
@@ -24,7 +30,13 @@ onEvent('recipes', (event) => {
                 type: 'ITEM',
                 id: 'pneumaticcraft:reinforced_chest',
                 amount: 1,
-                nbt: `{display:{Name:'[{"text":"Undergarden Mineral Survey"}]',Lore:['[{"text":"A collection of minerals from the Undergarden.","color":"gold"}]']},BlockEntityTag:{LootTable:"enigmatica:chests/amadron_mineral_survey_undergarden_combo"}}`
+                nbt: JSON.stringify({
+                    display: {
+                        Name: '[{ "translate": "desc.enigmatica.amadron.undergarden_mineral" }]',
+                        Lore: ['[{ "translate": "desc.enigmatica.amadron.undergarden_mineral.lore", "color": "gold" }]']
+                    },
+                    BlockEntityTag: { LootTable: 'enigmatica:chests/amadron_mineral_survey_undergarden_combo' }
+                })
             },
             level: 0,
             maxStock: 5,
@@ -38,7 +50,13 @@ onEvent('recipes', (event) => {
                 type: 'ITEM',
                 id: 'pneumaticcraft:reinforced_chest',
                 amount: 1,
-                nbt: `{display:{Name:'[{"text":"Nether Botanical Survey"}]',Lore:['[{"text":"A collection of botanical samples from the Nether.","color":"gold"}]']},BlockEntityTag:{LootTable:"enigmatica:chests/amadron_botanical_survey_nether_combo"}}`
+                nbt: JSON.stringify({
+                    display: {
+                        Name: '[{ "translate": "desc.enigmatica.amadron.nether_botanical" }]',
+                        Lore: ['[{ "translate": "desc.enigmatica.amadron.nether_botanical.lore", "color": "gold" }]']
+                    },
+                    BlockEntityTag: { LootTable: 'enigmatica:chests/amadron_botanical_survey_nether_combo' }
+                })
             },
             level: 0,
             maxStock: 5,
@@ -52,7 +70,13 @@ onEvent('recipes', (event) => {
                 type: 'ITEM',
                 id: 'pneumaticcraft:reinforced_chest',
                 amount: 1,
-                nbt: `{display:{Name:'[{"text":"End Botanical Survey"}]',Lore:['[{"text":"A collection of botanical samples from the End.","color":"gold"}]']},BlockEntityTag:{LootTable:"enigmatica:chests/amadron_botanical_survey_end_combo"}}`
+                nbt: JSON.stringify({
+                    display: {
+                        Name: '[{ "translate": "desc.enigmatica.amadron.end_botanical" }]',
+                        Lore: ['[{ "translate": "desc.enigmatica.amadron.end_botanical.lore", "color": "gold" }]']
+                    },
+                    BlockEntityTag: { LootTable: 'enigmatica:chests/amadron_botanical_survey_end_combo' }
+                })
             },
             level: 0,
             maxStock: 5,
@@ -66,7 +90,13 @@ onEvent('recipes', (event) => {
                 type: 'ITEM',
                 id: 'pneumaticcraft:reinforced_chest',
                 amount: 1,
-                nbt: `{display:{Name:'[{"text":"The End Mineral Survey"}]',Lore:['[{"text":"A collection of minerals from the The End.","color":"gold"}]']},BlockEntityTag:{LootTable:"enigmatica:chests/amadron_mineral_survey_the_end_combo"}}`
+                nbt: JSON.stringify({
+                    display: {
+                        Name: '[{ "translate": "desc.enigmatica.amadron.end_mineral" }]',
+                        Lore: ['[{ "translate": "desc.enigmatica.amadron.end_mineral.lore", "color": "gold" }]']
+                    },
+                    BlockEntityTag: { LootTable: 'enigmatica:chests/amadron_mineral_survey_the_end_combo' }
+                })
             },
             level: 0,
             maxStock: 5,

diff --git a/kubejs/startup_scripts/item_registry.js b/kubejs/startup_scripts/item_registry.js
@@ -502,15 +502,13 @@ onEvent('item.registry', (event) => {
         .group('KubeJS')
         .texture('kubejs:item/magic_lamp')
         .maxStackSize(1)
-        .maxDamage(500)
-        .displayName('Fisher Foliot');
+        .maxDamage(500);
     event
         .create('miner_marid_irradiated')
         .group('KubeJS')
         .texture('kubejs:item/magic_lamp')
         .maxStackSize(1)
-        .maxDamage(50)
-        .displayName('Irradiated Ore Miner Marid');
+        .maxDamage(50);
 
     // Custom Foods
     event
@@ -519,6 +517,5 @@ onEvent('item.registry', (event) => {
         .texture('kubejs:item/meat_ingot')
         .food((food) => {
             food.hunger(8).saturation(0.5).effect('upgrade_aquatic:vibing', 2400, 1, 1.0);
-        })
-        .displayName('Meat Ingot');
+        });
 });
diff --git a/kubejs/startup_scripts/multiblock_gamestages.js b/kubejs/startup_scripts/multiblock_gamestages.js
@@ -31,7 +31,7 @@ onEvent('ie.multiblock.form', (event) => {
         if (!event.getEntity().stages.has(requiredGameStage.get(name))) {
             event.cancel();
             if (!event.getEntity().getServer()) {
-                let error_message = `Invalid structure or missing gamestage. Double check the structure and/or obtain the appropriate Machinery Schematic to be able to form this multiblock.`;
+                let error_message = Text.translate('desc.enigmatica.ie_multiblock_error');
                 event.getEntity().tell(error_message);
             }
         }