diff --git a/src/generated/resources/assets/gtceu/lang/en_ud.json b/src/generated/resources/assets/gtceu/lang/en_ud.json index d89b7aaa2e2..38a3a9e2177 100644 --- a/src/generated/resources/assets/gtceu/lang/en_ud.json +++ b/src/generated/resources/assets/gtceu/lang/en_ud.json @@ -4742,7 +4742,7 @@ "item.gtceu.storage_cover": "ɹǝʌoƆ ǝbɐɹoʇS", "item.gtceu.sugar_gem": "ǝqnƆ ɹɐbnS", "item.gtceu.sus_record": "ɔsıᗡ ɔısnW", - "item.gtceu.sus_record.desc": "¡ʎssnsㄥ§", + "item.gtceu.sus_record.desc": "¡ʎssns", "item.gtceu.sword_extruder_mold.tooltip": "spɹoʍS buıʞɐɯ ɹoɟ ǝdɐɥS ɹǝpnɹʇxƎㄥ§", "item.gtceu.tag_filter.tooltip.0": "˙ㄥ§ɹǝʌoƆɟ§ sɐ ㄥ§bɐ⟘ɟ§ ɥʇıʍ O/I ㄥ§ɯǝʇIɟ§ sɹǝʇןıℲㄥ§", "item.gtceu.tag_filter.tooltip.1": "˙ǝpɐɹbdn ㄥ§ɯɹⱯ ɔıʇoqoᴚɟ§ puɐ ㄥ§ǝןnpoW ɹoʎǝʌuoƆɟ§ ɐ sɐ pǝsn ǝq uɐƆ", diff --git a/src/generated/resources/assets/gtceu/lang/en_us.json b/src/generated/resources/assets/gtceu/lang/en_us.json index 469f583fe0b..9fb706a31cd 100644 --- a/src/generated/resources/assets/gtceu/lang/en_us.json +++ b/src/generated/resources/assets/gtceu/lang/en_us.json @@ -4742,7 +4742,7 @@ "item.gtceu.storage_cover": "Storage Cover", "item.gtceu.sugar_gem": "Sugar Cube", "item.gtceu.sus_record": "Music Disc", - "item.gtceu.sus_record.desc": "§7sussy!", + "item.gtceu.sus_record.desc": "sussy!", "item.gtceu.sword_extruder_mold.tooltip": "§7Extruder Shape for making Swords", "item.gtceu.tag_filter.tooltip.0": "§7Filters §fItem§7 I/O with §fTag§7 as §fCover§7.", "item.gtceu.tag_filter.tooltip.1": "Can be used as a §fConveyor Module§7 and §fRobotic Arm§7 upgrade.", diff --git a/src/generated/resources/data/gtceu/loot_modifiers/chests/extra/abandoned_mineshaft.json b/src/generated/resources/data/gtceu/loot_modifiers/chests/extra/abandoned_mineshaft.json new file mode 100644 index 00000000000..02ec5b7a12d --- /dev/null +++ b/src/generated/resources/data/gtceu/loot_modifiers/chests/extra/abandoned_mineshaft.json @@ -0,0 +1,14 @@ +{ + "type": "neoforge:add_table", + "conditions": [ + { + "condition": "gtceu:config_value", + "config_field": "worldgen.addLoot" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/abandoned_mineshaft" + } + ], + "table": "gtceu:chests/extra/abandoned_mineshaft" +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/loot_modifiers/chests/extra/desert_pyramid.json b/src/generated/resources/data/gtceu/loot_modifiers/chests/extra/desert_pyramid.json new file mode 100644 index 00000000000..c83d300e2d9 --- /dev/null +++ b/src/generated/resources/data/gtceu/loot_modifiers/chests/extra/desert_pyramid.json @@ -0,0 +1,14 @@ +{ + "type": "neoforge:add_table", + "conditions": [ + { + "condition": "gtceu:config_value", + "config_field": "worldgen.addLoot" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/desert_pyramid" + } + ], + "table": "gtceu:chests/extra/desert_pyramid" +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/loot_modifiers/chests/extra/jungle_temple.json b/src/generated/resources/data/gtceu/loot_modifiers/chests/extra/jungle_temple.json new file mode 100644 index 00000000000..1ef21cbe788 --- /dev/null +++ b/src/generated/resources/data/gtceu/loot_modifiers/chests/extra/jungle_temple.json @@ -0,0 +1,14 @@ +{ + "type": "neoforge:add_table", + "conditions": [ + { + "condition": "gtceu:config_value", + "config_field": "worldgen.addLoot" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/jungle_temple" + } + ], + "table": "gtceu:chests/extra/jungle_temple" +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/loot_modifiers/chests/extra/jungle_temple_dispenser.json b/src/generated/resources/data/gtceu/loot_modifiers/chests/extra/jungle_temple_dispenser.json new file mode 100644 index 00000000000..438cc1d0961 --- /dev/null +++ b/src/generated/resources/data/gtceu/loot_modifiers/chests/extra/jungle_temple_dispenser.json @@ -0,0 +1,14 @@ +{ + "type": "neoforge:add_table", + "conditions": [ + { + "condition": "gtceu:config_value", + "config_field": "worldgen.addLoot" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/jungle_temple_dispenser" + } + ], + "table": "gtceu:chests/extra/jungle_temple_dispenser" +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/loot_modifiers/chests/extra/simple_dungeon.json b/src/generated/resources/data/gtceu/loot_modifiers/chests/extra/simple_dungeon.json new file mode 100644 index 00000000000..15303b875e7 --- /dev/null +++ b/src/generated/resources/data/gtceu/loot_modifiers/chests/extra/simple_dungeon.json @@ -0,0 +1,14 @@ +{ + "type": "neoforge:add_table", + "conditions": [ + { + "condition": "gtceu:config_value", + "config_field": "worldgen.addLoot" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/simple_dungeon" + } + ], + "table": "gtceu:chests/extra/simple_dungeon" +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/loot_modifiers/chests/extra/spawn_bonus_chest.json b/src/generated/resources/data/gtceu/loot_modifiers/chests/extra/spawn_bonus_chest.json new file mode 100644 index 00000000000..1ba79a0666b --- /dev/null +++ b/src/generated/resources/data/gtceu/loot_modifiers/chests/extra/spawn_bonus_chest.json @@ -0,0 +1,14 @@ +{ + "type": "neoforge:add_table", + "conditions": [ + { + "condition": "gtceu:config_value", + "config_field": "worldgen.addLoot" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/spawn_bonus_chest" + } + ], + "table": "gtceu:chests/extra/spawn_bonus_chest" +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/loot_modifiers/chests/extra/stronghold_corridor.json b/src/generated/resources/data/gtceu/loot_modifiers/chests/extra/stronghold_corridor.json new file mode 100644 index 00000000000..5d6aff81142 --- /dev/null +++ b/src/generated/resources/data/gtceu/loot_modifiers/chests/extra/stronghold_corridor.json @@ -0,0 +1,14 @@ +{ + "type": "neoforge:add_table", + "conditions": [ + { + "condition": "gtceu:config_value", + "config_field": "worldgen.addLoot" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/stronghold_corridor" + } + ], + "table": "gtceu:chests/extra/stronghold_corridor" +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/loot_modifiers/chests/extra/stronghold_crossing.json b/src/generated/resources/data/gtceu/loot_modifiers/chests/extra/stronghold_crossing.json new file mode 100644 index 00000000000..4eb73774f68 --- /dev/null +++ b/src/generated/resources/data/gtceu/loot_modifiers/chests/extra/stronghold_crossing.json @@ -0,0 +1,14 @@ +{ + "type": "neoforge:add_table", + "conditions": [ + { + "condition": "gtceu:config_value", + "config_field": "worldgen.addLoot" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/stronghold_crossing" + } + ], + "table": "gtceu:chests/extra/stronghold_crossing" +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/loot_modifiers/chests/extra/village_weaponsmith.json b/src/generated/resources/data/gtceu/loot_modifiers/chests/extra/village_weaponsmith.json new file mode 100644 index 00000000000..bb780cbb3f8 --- /dev/null +++ b/src/generated/resources/data/gtceu/loot_modifiers/chests/extra/village_weaponsmith.json @@ -0,0 +1,14 @@ +{ + "type": "neoforge:add_table", + "conditions": [ + { + "condition": "gtceu:config_value", + "config_field": "worldgen.addLoot" + }, + { + "condition": "neoforge:loot_table_id", + "loot_table_id": "minecraft:chests/village/village_weaponsmith" + } + ], + "table": "gtceu:chests/extra/village_weaponsmith" +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/loot_table/chests/extra/abandoned_mineshaft.json b/src/generated/resources/data/gtceu/loot_table/chests/extra/abandoned_mineshaft.json new file mode 100644 index 00000000000..5491fe7466d --- /dev/null +++ b/src/generated/resources/data/gtceu/loot_table/chests/extra/abandoned_mineshaft.json @@ -0,0 +1,476 @@ +{ + "type": "minecraft:chest", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:silver_ingot", + "weight": 12 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:lead_ingot", + "weight": 3 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:steel_ingot", + "weight": 6 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:bronze_ingot", + "weight": 6 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:manganese_ingot", + "weight": 6 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:sapphire_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:green_sapphire_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:olivine_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:red_garnet_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:yellow_garnet_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:ruby_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "minecraft:emerald", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 12.0, + "min": 3.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:damascus_steel_ingot" + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:damascus_steel_ingot" + } + ], + "rolls": { + "type": "minecraft:uniform", + "max": 2.0, + "min": -1.0 + } + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "gtceu:config_value", + "config_field": "worldgen.increaseDungeonLoot" + } + ], + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:silver_ingot", + "weight": 12 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:lead_ingot", + "weight": 3 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:steel_ingot", + "weight": 6 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:bronze_ingot", + "weight": 6 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:manganese_ingot", + "weight": 6 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:sapphire_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:green_sapphire_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:olivine_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:red_garnet_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:yellow_garnet_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:ruby_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "minecraft:emerald", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 12.0, + "min": 3.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:damascus_steel_ingot" + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:damascus_steel_ingot" + } + ], + "rolls": { + "type": "minecraft:uniform", + "max": 2.0, + "min": -1.0 + } + } + ], + "random_sequence": "gtceu:chests/extra/abandoned_mineshaft" +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/loot_table/chests/extra/desert_pyramid.json b/src/generated/resources/data/gtceu/loot_table/chests/extra/desert_pyramid.json new file mode 100644 index 00000000000..5bdc32b9c4d --- /dev/null +++ b/src/generated/resources/data/gtceu/loot_table/chests/extra/desert_pyramid.json @@ -0,0 +1,288 @@ +{ + "type": "minecraft:chest", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 16.0, + "min": 4.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:silver_ingot", + "weight": 12 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:platinum_ingot", + "weight": 4 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:ruby_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:sapphire_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:green_sapphire_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:olivine_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:red_garnet_gem", + "weight": 4 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:yellow_garnet_gem", + "weight": 4 + } + ], + "rolls": { + "type": "minecraft:uniform", + "max": 3.0, + "min": -1.0 + } + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "gtceu:config_value", + "config_field": "worldgen.increaseDungeonLoot" + } + ], + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 16.0, + "min": 4.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:silver_ingot", + "weight": 12 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:platinum_ingot", + "weight": 4 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:ruby_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:sapphire_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:green_sapphire_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:olivine_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:red_garnet_gem", + "weight": 4 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:yellow_garnet_gem", + "weight": 4 + } + ], + "rolls": { + "type": "minecraft:uniform", + "max": 3.0, + "min": -1.0 + } + } + ], + "random_sequence": "gtceu:chests/extra/desert_pyramid" +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/loot_table/chests/extra/jungle_temple.json b/src/generated/resources/data/gtceu/loot_table/chests/extra/jungle_temple.json new file mode 100644 index 00000000000..d6e44f34fcd --- /dev/null +++ b/src/generated/resources/data/gtceu/loot_table/chests/extra/jungle_temple.json @@ -0,0 +1,278 @@ +{ + "type": "minecraft:chest", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "chance": 0.01, + "condition": "minecraft:random_chance" + } + ], + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "charge": 9223372036854775807, + "function": "gtceu:set_eu_charge" + } + ], + "name": "gtceu:zero_point_module" + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 16.0, + "min": 4.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:bronze_ingot", + "weight": 12 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:ruby_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:sapphire_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:green_sapphire_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:olivine_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:red_garnet_gem", + "weight": 4 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:yellow_garnet_gem", + "weight": 4 + } + ], + "rolls": { + "type": "minecraft:uniform", + "max": 4.0, + "min": -1.0 + } + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "gtceu:config_value", + "config_field": "worldgen.increaseDungeonLoot" + } + ], + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 16.0, + "min": 4.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:bronze_ingot", + "weight": 12 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:ruby_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:sapphire_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:green_sapphire_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:olivine_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:red_garnet_gem", + "weight": 4 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:yellow_garnet_gem", + "weight": 4 + } + ], + "rolls": { + "type": "minecraft:uniform", + "max": 4.0, + "min": -1.0 + } + } + ], + "random_sequence": "gtceu:chests/extra/jungle_temple" +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/loot_table/chests/extra/jungle_temple_dispenser.json b/src/generated/resources/data/gtceu/loot_table/chests/extra/jungle_temple_dispenser.json new file mode 100644 index 00000000000..128d34d4d70 --- /dev/null +++ b/src/generated/resources/data/gtceu/loot_table/chests/extra/jungle_temple_dispenser.json @@ -0,0 +1,31 @@ +{ + "type": "minecraft:chest", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "minecraft:fire_charge" + } + ], + "rolls": { + "type": "minecraft:uniform", + "max": 1.0, + "min": 0.0 + } + } + ], + "random_sequence": "gtceu:chests/extra/jungle_temple_dispenser" +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/loot_table/chests/extra/simple_dungeon.json b/src/generated/resources/data/gtceu/loot_table/chests/extra/simple_dungeon.json new file mode 100644 index 00000000000..73c10d2aac7 --- /dev/null +++ b/src/generated/resources/data/gtceu/loot_table/chests/extra/simple_dungeon.json @@ -0,0 +1,572 @@ +{ + "type": "minecraft:chest", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 4.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:purple_drink", + "weight": 15 + }, + { + "type": "minecraft:item", + "name": "gtceu:sus_record" + } + ], + "rolls": { + "type": "minecraft:uniform", + "max": 1.0, + "min": -2.0 + } + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 4.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:purple_drink", + "weight": 8 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:silver_ingot", + "weight": 12 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:lead_ingot", + "weight": 3 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:steel_ingot", + "weight": 6 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:bronze_ingot", + "weight": 6 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:manganese_ingot", + "weight": 6 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:damascus_steel_ingot" + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "minecraft:emerald", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:ruby_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:sapphire_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:green_sapphire_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:olivine_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:red_garnet_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:yellow_garnet_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:neodymium_dust", + "weight": 4 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:chromium_dust", + "weight": 4 + } + ], + "rolls": { + "type": "minecraft:uniform", + "max": 2.0, + "min": -1.0 + } + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "gtceu:config_value", + "config_field": "worldgen.increaseDungeonLoot" + } + ], + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 4.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:purple_drink", + "weight": 8 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:silver_ingot", + "weight": 12 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:lead_ingot", + "weight": 3 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:steel_ingot", + "weight": 6 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:bronze_ingot", + "weight": 6 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:manganese_ingot", + "weight": 6 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:damascus_steel_ingot" + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "minecraft:emerald", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:ruby_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:sapphire_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:green_sapphire_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:olivine_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:red_garnet_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:yellow_garnet_gem", + "weight": 2 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:neodymium_dust", + "weight": 4 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 6.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:chromium_dust", + "weight": 4 + } + ], + "rolls": { + "type": "minecraft:uniform", + "max": 2.0, + "min": -1.0 + } + } + ], + "random_sequence": "gtceu:chests/extra/simple_dungeon" +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/loot_table/chests/extra/spawn_bonus_chest.json b/src/generated/resources/data/gtceu/loot_table/chests/extra/spawn_bonus_chest.json new file mode 100644 index 00000000000..c142ab4e1eb --- /dev/null +++ b/src/generated/resources/data/gtceu/loot_table/chests/extra/spawn_bonus_chest.json @@ -0,0 +1,62 @@ +{ + "type": "minecraft:chest", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 16.0, + "min": 8.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:purple_drink" + } + ], + "rolls": { + "type": "minecraft:uniform", + "max": 1.0, + "min": 0.0 + } + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "gtceu:config_value", + "config_field": "worldgen.increaseDungeonLoot" + } + ], + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 16.0, + "min": 8.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:purple_drink" + } + ], + "rolls": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + } + } + ], + "random_sequence": "gtceu:chests/extra/spawn_bonus_chest" +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/loot_table/chests/extra/stronghold_corridor.json b/src/generated/resources/data/gtceu/loot_table/chests/extra/stronghold_corridor.json new file mode 100644 index 00000000000..7b9bb9aee45 --- /dev/null +++ b/src/generated/resources/data/gtceu/loot_table/chests/extra/stronghold_corridor.json @@ -0,0 +1,92 @@ +{ + "type": "minecraft:chest", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:damascus_steel_ingot" + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 12.0, + "min": 3.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:damascus_steel_ingot" + } + ], + "rolls": { + "type": "minecraft:uniform", + "max": 2.0, + "min": -2.0 + } + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "gtceu:config_value", + "config_field": "worldgen.increaseDungeonLoot" + } + ], + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:damascus_steel_ingot" + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 12.0, + "min": 3.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:damascus_steel_ingot" + } + ], + "rolls": { + "type": "minecraft:uniform", + "max": 2.0, + "min": -2.0 + } + } + ], + "random_sequence": "gtceu:chests/extra/stronghold_corridor" +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/loot_table/chests/extra/stronghold_crossing.json b/src/generated/resources/data/gtceu/loot_table/chests/extra/stronghold_crossing.json new file mode 100644 index 00000000000..d260b8cd418 --- /dev/null +++ b/src/generated/resources/data/gtceu/loot_table/chests/extra/stronghold_crossing.json @@ -0,0 +1,224 @@ +{ + "type": "minecraft:chest", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 4.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:damascus_steel_ingot", + "weight": 6 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 16.0, + "min": 8.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:steel_ingot", + "weight": 12 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 16.0, + "min": 8.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:bronze_ingot", + "weight": 12 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 4.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:manganese_ingot", + "weight": 12 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 4.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:neodymium_dust", + "weight": 6 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:chromium_dust", + "weight": 6 + } + ], + "rolls": { + "type": "minecraft:uniform", + "max": 3.0, + "min": -1.0 + } + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "gtceu:config_value", + "config_field": "worldgen.increaseDungeonLoot" + } + ], + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 4.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:damascus_steel_ingot", + "weight": 6 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 16.0, + "min": 8.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:steel_ingot", + "weight": 12 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 16.0, + "min": 8.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:bronze_ingot", + "weight": 12 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 4.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:manganese_ingot", + "weight": 12 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 4.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:neodymium_dust", + "weight": 6 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:chromium_dust", + "weight": 6 + } + ], + "rolls": { + "type": "minecraft:uniform", + "max": 3.0, + "min": -1.0 + } + } + ], + "random_sequence": "gtceu:chests/extra/stronghold_crossing" +} \ No newline at end of file diff --git a/src/generated/resources/data/gtceu/loot_table/chests/extra/village_weaponsmith.json b/src/generated/resources/data/gtceu/loot_table/chests/extra/village_weaponsmith.json new file mode 100644 index 00000000000..60f13ce5aaa --- /dev/null +++ b/src/generated/resources/data/gtceu/loot_table/chests/extra/village_weaponsmith.json @@ -0,0 +1,254 @@ +{ + "type": "minecraft:chest", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:chromium_dust", + "weight": 6 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:neodymium_dust", + "weight": 6 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:manganese_ingot", + "weight": 12 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 12.0, + "min": 4.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:steel_ingot", + "weight": 12 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 12.0, + "min": 4.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:bronze_ingot", + "weight": 12 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 12.0, + "min": 4.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:brass_ingot", + "weight": 12 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 12.0, + "min": 4.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:damascus_steel_ingot" + } + ], + "rolls": { + "type": "minecraft:uniform", + "max": 4.0, + "min": -1.0 + } + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "gtceu:config_value", + "config_field": "worldgen.increaseDungeonLoot" + } + ], + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:chromium_dust", + "weight": 6 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:neodymium_dust", + "weight": 6 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 8.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:manganese_ingot", + "weight": 12 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 12.0, + "min": 4.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:steel_ingot", + "weight": 12 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 12.0, + "min": 4.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:bronze_ingot", + "weight": 12 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 12.0, + "min": 4.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:brass_ingot", + "weight": 12 + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 12.0, + "min": 4.0 + }, + "function": "minecraft:set_count" + } + ], + "name": "gtceu:damascus_steel_ingot" + } + ], + "rolls": { + "type": "minecraft:uniform", + "max": 4.0, + "min": -1.0 + } + } + ], + "random_sequence": "gtceu:chests/extra/village_weaponsmith" +} \ No newline at end of file diff --git a/src/generated/resources/data/neoforge/loot_modifiers/global_loot_modifiers.json b/src/generated/resources/data/neoforge/loot_modifiers/global_loot_modifiers.json new file mode 100644 index 00000000000..6dad4e6ef77 --- /dev/null +++ b/src/generated/resources/data/neoforge/loot_modifiers/global_loot_modifiers.json @@ -0,0 +1,14 @@ +{ + "entries": [ + "gtceu:chests/extra/spawn_bonus_chest", + "gtceu:chests/extra/simple_dungeon", + "gtceu:chests/extra/desert_pyramid", + "gtceu:chests/extra/jungle_temple", + "gtceu:chests/extra/jungle_temple_dispenser", + "gtceu:chests/extra/abandoned_mineshaft", + "gtceu:chests/extra/village_weaponsmith", + "gtceu:chests/extra/stronghold_crossing", + "gtceu:chests/extra/stronghold_corridor" + ], + "replace": false +} \ No newline at end of file diff --git a/src/main/java/com/gregtechceu/gtceu/api/data/chemical/ChemicalHelper.java b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/ChemicalHelper.java index 4a85ac25eab..9632383ec96 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/data/chemical/ChemicalHelper.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/chemical/ChemicalHelper.java @@ -19,6 +19,7 @@ import net.minecraft.tags.TagKey; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.block.Block; @@ -249,6 +250,16 @@ public static List getItems(MaterialEntry materialEntry) { }).stream().map(Supplier::get).collect(Collectors.toList()); } + public static Item getItem(MaterialEntry materialEntry) { + List items = getItems(materialEntry); + if (items.isEmpty()) return Items.AIR; + return items.get(0).asItem(); + } + + public static Item getItem(TagPrefix tagPrefix, Material material) { + return getItem(new MaterialEntry(tagPrefix, material)); + } + public static ItemStack get(MaterialEntry materialEntry, int size) { var list = getItems(materialEntry); if (list.isEmpty()) return ItemStack.EMPTY; diff --git a/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/veins/VeinedVeinGenerator.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/veins/VeinedVeinGenerator.java index 3b87401442c..c0aa3929a52 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/veins/VeinedVeinGenerator.java +++ b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/generator/veins/VeinedVeinGenerator.java @@ -8,7 +8,7 @@ import com.gregtechceu.gtceu.api.data.worldgen.ores.OreBlockPlacer; import com.gregtechceu.gtceu.api.data.worldgen.ores.OreVeinUtil; import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.common.data.GTWorldgen; +import com.gregtechceu.gtceu.common.data.worldgen.GTDensityFunctions; import com.gregtechceu.gtceu.utils.GTUtil; import com.gregtechceu.gtceu.utils.WeightedEntry; @@ -125,17 +125,15 @@ public Map generate(WorldGenLevel level, RandomSource } final Blender finalizedBlender = blender; - DensityFunction veinToggle = mapToNoise(densityFunctions.get(GTWorldgen.NEW_ORE_VEIN_TOGGLE), + DensityFunction veinToggle = mapToNoise(densityFunctions.get(GTDensityFunctions.NEW_ORE_VEIN_TOGGLE), randomState); - DensityFunction veinRidged = mapToNoise(densityFunctions.get(GTWorldgen.NEW_ORE_VEIN_RIDGED), + DensityFunction veinRidged = mapToNoise(densityFunctions.get(GTDensityFunctions.NEW_ORE_VEIN_RIDGED), randomState); int size = entry.clusterSize().sample(random); int radius = Mth.ceil(size / 2f); - int placedCount = 0; - int randOffsetX = random.nextInt(16); int randOffsetY = random.nextInt(16); int randOffsetZ = random.nextInt(16); diff --git a/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/modifier/DimensionFilter.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/modifier/DimensionFilter.java deleted file mode 100644 index d524eb10cc1..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/modifier/DimensionFilter.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.gregtechceu.gtceu.api.data.worldgen.modifier; - -import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.registry.GTRegistries; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.HolderSet; -import net.minecraft.core.RegistryCodecs; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.core.registries.Registries; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.dimension.DimensionType; -import net.minecraft.world.level.levelgen.placement.PlacementContext; -import net.minecraft.world.level.levelgen.placement.PlacementFilter; -import net.minecraft.world.level.levelgen.placement.PlacementModifierType; - -import com.mojang.serialization.MapCodec; -import com.mojang.serialization.codecs.RecordCodecBuilder; - -public class DimensionFilter extends PlacementFilter { - - public static final PlacementModifierType DIMENSION_FILTER = GTRegistries - .register(BuiltInRegistries.PLACEMENT_MODIFIER_TYPE, GTCEu.id("dimension"), () -> DimensionFilter.CODEC); - - public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(instance -> instance.group( - RegistryCodecs.homogeneousList(Registries.DIMENSION_TYPE).fieldOf("dimension_id") - .forGetter(filter -> filter.dimensionId)) - .apply(instance, DimensionFilter::new)); - - public HolderSet dimensionId; - - public DimensionFilter(HolderSet dimensionId) { - this.dimensionId = dimensionId; - } - - @Override - protected boolean shouldPlace(PlacementContext context, RandomSource random, BlockPos pos) { - return this.dimensionId.contains(context.getLevel().getLevel().dimensionTypeRegistration()); - } - - @Override - public PlacementModifierType type() { - return DIMENSION_FILTER; - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/modifier/FrequencyModifier.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/modifier/FrequencyModifier.java deleted file mode 100644 index b67ee0bec32..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/modifier/FrequencyModifier.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.gregtechceu.gtceu.api.data.worldgen.modifier; - -import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.registry.GTRegistries; - -import net.minecraft.core.BlockPos; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.util.ExtraCodecs; -import net.minecraft.util.Mth; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.levelgen.placement.PlacementContext; -import net.minecraft.world.level.levelgen.placement.PlacementModifier; -import net.minecraft.world.level.levelgen.placement.PlacementModifierType; - -import com.mojang.serialization.MapCodec; - -import java.util.stream.Stream; - -public class FrequencyModifier extends PlacementModifier { - - public static final PlacementModifierType FREQUENCY_MODIFIER = GTRegistries - .register(BuiltInRegistries.PLACEMENT_MODIFIER_TYPE, GTCEu.id("frequency"), () -> FrequencyModifier.CODEC); - - public static final MapCodec CODEC = ExtraCodecs.POSITIVE_FLOAT.fieldOf("chance") - .xmap(FrequencyModifier::new, (modifier) -> modifier.frequency); - - private final float frequency; - - public FrequencyModifier(float frequency) { - this.frequency = frequency; - } - - @Override - public Stream getPositions(PlacementContext context, RandomSource random, BlockPos pos) { - int count = getCount(frequency, random); - if (count == 0) { - return Stream.empty(); - } - return Stream.of(pos); - } - - public int getCount(float frequency, RandomSource random) { - int floored = Mth.floor(frequency); - return floored + (random.nextFloat() < (frequency - floored) ? 1 : 0); - } - - @Override - public PlacementModifierType type() { - return FREQUENCY_MODIFIER; - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/modifier/package-info.java b/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/modifier/package-info.java deleted file mode 100644 index 67cd414bc98..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/modifier/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -@ParametersAreNonnullByDefault -@MethodsReturnNonnullByDefault -@FieldsAreNonnullByDefault -package com.gregtechceu.gtceu.api.data.worldgen.modifier; - -import net.minecraft.FieldsAreNonnullByDefault; -import net.minecraft.MethodsReturnNonnullByDefault; - -import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/com/gregtechceu/gtceu/api/loot/modifier/package-info.java b/src/main/java/com/gregtechceu/gtceu/api/loot/modifier/package-info.java new file mode 100644 index 00000000000..0dffd93bb72 --- /dev/null +++ b/src/main/java/com/gregtechceu/gtceu/api/loot/modifier/package-info.java @@ -0,0 +1,4 @@ +@NotNullByDefault +package com.gregtechceu.gtceu.api.loot.modifier; + +import org.jetbrains.annotations.NotNullByDefault; diff --git a/src/main/java/com/gregtechceu/gtceu/api/loot/serializer/package-info.java b/src/main/java/com/gregtechceu/gtceu/api/loot/serializer/package-info.java new file mode 100644 index 00000000000..74aad1850d3 --- /dev/null +++ b/src/main/java/com/gregtechceu/gtceu/api/loot/serializer/package-info.java @@ -0,0 +1,4 @@ +@NotNullByDefault +package com.gregtechceu.gtceu.api.loot.serializer; + +import org.jetbrains.annotations.NotNullByDefault; diff --git a/src/main/java/com/gregtechceu/gtceu/api/registry/GTRegistries.java b/src/main/java/com/gregtechceu/gtceu/api/registry/GTRegistries.java index 76a3beb1935..c776cc8ced8 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/registry/GTRegistries.java +++ b/src/main/java/com/gregtechceu/gtceu/api/registry/GTRegistries.java @@ -26,7 +26,6 @@ import net.minecraft.core.MappedRegistry; import net.minecraft.core.Registry; -import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; @@ -116,15 +115,14 @@ private static ResourceKey> makeRegistryKey(ResourceLocation reg public static final Registry SOUNDS = makeRegistry(Keys.SOUND, false); public static final Registry CHANCE_LOGICS = makeRegistry(Keys.CHANCE_LOGIC); public static final Registry> RECIPE_CAPABILITIES = makeRegistry(Keys.RECIPE_CAPABILITY); - + static { + // manually insert the vanilla recipe type registry into the load order list TWICE: + // - once for the actual recipe type registry + addRegistryToLoadOrder(Registries.RECIPE_TYPE, null); + // - a duplicate entry for the custom KubeJS builder type + addRegistryToLoadOrder(Keys.RECIPE_TYPE, null); + } public static final Registry DIMENSION_MARKERS = makeRegistry(Keys.DIMENSION_MARKER, false); - /** - * Use {@link BuiltInRegistries#RECIPE_TYPE} instead of this. This only exists to simplify KubeJS registration. - * - * @see Registries#RECIPE_TYPE - */ - @ApiStatus.Internal - public static final Registry RECIPE_TYPES = makeRegistry(Keys.RECIPE_TYPE); public static final Registry> RECIPE_CONDITIONS = makeRegistry(Keys.RECIPE_CONDITION); public static final Registry RECIPE_CATEGORIES = makeRegistry(Keys.RECIPE_CATEGORY); diff --git a/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/MachineBuilder.java b/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/MachineBuilder.java index 9042c4f2e30..dcfdfc24aa5 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/MachineBuilder.java +++ b/src/main/java/com/gregtechceu/gtceu/api/registry/registrate/MachineBuilder.java @@ -58,6 +58,7 @@ import com.tterrag.registrate.builders.ItemBuilder; import com.tterrag.registrate.providers.DataGenContext; import com.tterrag.registrate.providers.ProviderType; +import com.tterrag.registrate.providers.RegistrateLangProvider; import com.tterrag.registrate.util.entry.BlockEntry; import com.tterrag.registrate.util.nullness.NonNullBiConsumer; import com.tterrag.registrate.util.nullness.NonNullConsumer; @@ -163,6 +164,8 @@ public MachineBuilder(GTRegistrate registrate, String name, this.itemFactory = itemFactory; this.instanceFactory = instanceFactory; this.definition = definition; + + this.defaultLang(); } @SuppressWarnings("unchecked") @@ -309,6 +312,14 @@ public SELF ui(PanelFactory ui) { return getThis(); } + public SELF defaultLang() { + return lang(RegistrateLangProvider.toEnglishName(name)); + } + + public SELF lang(String name) { + return langValue(name); + } + public SELF langValue(String langValue) { this.langValue = langValue; return getThis(); diff --git a/src/main/java/com/gregtechceu/gtceu/common/CommonProxy.java b/src/main/java/com/gregtechceu/gtceu/common/CommonProxy.java index a581c135935..b9b85792e15 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/CommonProxy.java +++ b/src/main/java/com/gregtechceu/gtceu/common/CommonProxy.java @@ -46,10 +46,11 @@ import com.gregtechceu.gtceu.client.model.machine.MachineRenderState; import com.gregtechceu.gtceu.common.block.*; import com.gregtechceu.gtceu.common.data.*; -import com.gregtechceu.gtceu.common.data.GTBlocks; import com.gregtechceu.gtceu.common.data.item.*; +import com.gregtechceu.gtceu.common.data.loot.*; import com.gregtechceu.gtceu.common.data.machines.GTMachineUtils; import com.gregtechceu.gtceu.common.data.materials.GTFoods; +import com.gregtechceu.gtceu.common.data.worldgen.*; import com.gregtechceu.gtceu.common.fluid.potion.BottleItemFluidHandler; import com.gregtechceu.gtceu.common.fluid.potion.PotionItemFluidHandler; import com.gregtechceu.gtceu.common.item.DrumMachineItem; @@ -65,7 +66,6 @@ import com.gregtechceu.gtceu.core.mixins.registrate.AbstractRegistrateAccessor; import com.gregtechceu.gtceu.data.GregTechDatagen; import com.gregtechceu.gtceu.data.lang.MaterialLangGenerator; -import com.gregtechceu.gtceu.data.loot.ChestGenHooks; import com.gregtechceu.gtceu.data.pack.GTDynamicDataPack; import com.gregtechceu.gtceu.data.pack.GTDynamicResourcePack; import com.gregtechceu.gtceu.data.pack.GTPackSource; @@ -225,7 +225,10 @@ public static void onRegister(RegisterEvent event) { GregTechDatagen.initPost(); GTValueProviderTypes.init(modBus); - GTFeatures.register(modBus); + GTFeatures.init(modBus); + GTPlacementModifiers.init(modBus); + GTLootConditions.init(modBus); + GTLootFunctions.init(modBus); VeinGenerators.registerAddonGenerators(); IndicatorGenerators.registerAddonGenerators(); WaypointManager.init(); @@ -233,7 +236,6 @@ public static void onRegister(RegisterEvent event) { CustomBlockRotations.init(); SyncedKeyMappings.init(); MachineOwner.init(); - ChestGenHooks.init(); } @ApiStatus.Internal diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java index 43afdf52eae..80c4abdd903 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java @@ -20,6 +20,7 @@ import com.gregtechceu.gtceu.common.block.explosive.PowderbarrelBlock; import com.gregtechceu.gtceu.common.data.blocks.GTDevBlocks; import com.gregtechceu.gtceu.common.data.models.GTModels; +import com.gregtechceu.gtceu.common.data.worldgen.GTConfiguredFeatures; import com.gregtechceu.gtceu.common.item.LampBlockItem; import com.gregtechceu.gtceu.common.item.LaserPipeBlockItem; import com.gregtechceu.gtceu.common.pipelike.duct.DuctPipeType; diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTDamageTypes.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTDamageTypes.java index 4472cc0b747..fb6ec6e3eff 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTDamageTypes.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTDamageTypes.java @@ -21,10 +21,6 @@ public class GTDamageTypes { public static void init() {} - private static ResourceKey create(String path) { - return ResourceKey.create(Registries.DAMAGE_TYPE, GTCEu.id(path)); - } - public static void bootstrap(BootstrapContext ctx) { ctx.register(HEAT, new DamageType("gtceu.heat", 0, DamageEffects.BURNING)); ctx.register(CHEMICAL, new DamageType("gtceu.chemical", 0)); @@ -38,4 +34,8 @@ public static void bootstrap(BootstrapContext ctx) { new DamageType("gtceu.medical_condition." + name, DamageScaling.NEVER, 0)); } } + + private static ResourceKey create(String path) { + return ResourceKey.create(Registries.DAMAGE_TYPE, GTCEu.id(path)); + } } diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTElements.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTElements.java index e2203a99da9..937d11c441e 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTElements.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTElements.java @@ -155,8 +155,7 @@ public static Element createAndRegister(long protons, long neutrons, double half } public static Element createAndRegister(ResourceLocation id, long protons, long neutrons, double halfLifeSeconds, - String decayTo, - String name, String symbol, boolean isIsotope) { + String decayTo, String name, String symbol, boolean isIsotope) { Element element = new Element(protons, neutrons, halfLifeSeconds, decayTo, name, symbol, isIsotope); GTRegistries.register(GTRegistries.ELEMENTS, id, element); return element; diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTEnchantmentProviders.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTEnchantmentProviders.java index 0c4757d28dd..7c1b4981cdd 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTEnchantmentProviders.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTEnchantmentProviders.java @@ -15,11 +15,15 @@ public class GTEnchantmentProviders { // spotless:off - public static final ResourceKey SILK_TOUCH = ResourceKey.create(Registries.ENCHANTMENT_PROVIDER, GTCEu.id("silk_touch")); + public static final ResourceKey SILK_TOUCH = create("silk_touch"); public static void bootstrap(BootstrapContext context) { HolderGetter holdergetter = context.lookup(Registries.ENCHANTMENT); context.register(SILK_TOUCH, new SingleEnchantment(holdergetter.getOrThrow(Enchantments.SILK_TOUCH), ConstantInt.of(1))); } // spotless:on + + private static ResourceKey create(String path) { + return ResourceKey.create(Registries.ENCHANTMENT_PROVIDER, GTCEu.id(path)); + } } diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTFeatures.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTFeatures.java deleted file mode 100644 index 122fa19927d..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTFeatures.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.gregtechceu.gtceu.common.data; - -import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.data.worldgen.modifier.BiomePlacement; -import com.gregtechceu.gtceu.api.data.worldgen.modifier.DimensionFilter; -import com.gregtechceu.gtceu.api.data.worldgen.modifier.FrequencyModifier; -import com.gregtechceu.gtceu.common.worldgen.feature.FluidSproutFeature; -import com.gregtechceu.gtceu.common.worldgen.feature.StoneBlobFeature; -import com.gregtechceu.gtceu.common.worldgen.modifier.RubberTreeChancePlacement; - -import net.minecraft.core.registries.Registries; -import net.minecraft.world.level.levelgen.feature.Feature; -import net.neoforged.bus.api.IEventBus; -import net.neoforged.neoforge.registries.DeferredHolder; -import net.neoforged.neoforge.registries.DeferredRegister; - -public class GTFeatures { - - public static final DeferredRegister> FEATURES = DeferredRegister.create(Registries.FEATURE, - GTCEu.MOD_ID); - - public static final DeferredHolder, StoneBlobFeature> STONE_BLOB = FEATURES.register( - "stone_blob", - StoneBlobFeature::new); - public static final DeferredHolder, FluidSproutFeature> FLUID_SPROUT = FEATURES.register( - "fluid_sprout", - FluidSproutFeature::new); - - private static void init() { - Object inst = FrequencyModifier.FREQUENCY_MODIFIER; // seemingly useless access to init the class in time - inst = DimensionFilter.DIMENSION_FILTER; - inst = BiomePlacement.BIOME_PLACEMENT; - inst = RubberTreeChancePlacement.RUBBER_TREE_CHANCE_PLACEMENT; - } - - public static void register(IEventBus modEventBus) { - init(); - FEATURES.register(modEventBus); - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java index fcdfdbd6627..4d99a33b842 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java @@ -2564,7 +2564,7 @@ public static ItemEntry createFluidCell(Material mat, int capacit public static ItemEntry SUS_RECORD = REGISTRATE .item("sus_record", Item::new) .lang("Music Disc") - .properties(p -> p.jukeboxPlayable(GTJukeboxSongs.SUS)) + .properties(p -> p.jukeboxPlayable(GTJukeboxSongs.SUS).stacksTo(1).rarity(Rarity.RARE)) .register(); public static ItemEntry NAN_CERTIFICATE = REGISTRATE.item("nan_certificate", Item::new) .lang("Certificate of Not Being a Noob Anymore").properties(p -> p.rarity(Rarity.EPIC)) diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTJukeboxSongs.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTJukeboxSongs.java index c31d83bf58d..4b13d8c26da 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTJukeboxSongs.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTJukeboxSongs.java @@ -11,7 +11,7 @@ public class GTJukeboxSongs { - public static final ResourceKey SUS = ResourceKey.create(Registries.JUKEBOX_SONG, GTCEu.id("sus")); + public static final ResourceKey SUS = create("sus"); public static void bootstrap(BootstrapContext ctx) { ctx.register(SUS, new JukeboxSong( @@ -19,4 +19,8 @@ public static void bootstrap(BootstrapContext ctx) { Component.translatable("item.gtceu.sus_record.desc"), 820, 1)); } + + private static ResourceKey create(String path) { + return ResourceKey.create(Registries.JUKEBOX_SONG, GTCEu.id(path)); + } } diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTValueProviderTypes.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTValueProviderTypes.java index 9535df0c1d5..cb8c9ca2806 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTValueProviderTypes.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTValueProviderTypes.java @@ -15,32 +15,21 @@ public class GTValueProviderTypes { - public static final DeferredRegister> INT_PROVIDER_TYPE_REGISTER = DeferredRegister.create( - Registries.INT_PROVIDER_TYPE, - GTCEu.MOD_ID); - public static final DeferredRegister> FLOAT_PROVIDER_TYPE_REGISTER = DeferredRegister.create( - Registries.FLOAT_PROVIDER_TYPE, - GTCEu.MOD_ID); - - public static final DeferredHolder, IntProviderType> FLOORED = INT_PROVIDER_TYPE_REGISTER - .register( - "floored", - () -> () -> FlooredInt.CODEC); - - public static final DeferredHolder, FloatProviderType> MULTIPLIED = FLOAT_PROVIDER_TYPE_REGISTER - .register("multiplied", - () -> () -> MultipliedFloat.CODEC); - public static final DeferredHolder, FloatProviderType> ADDED = FLOAT_PROVIDER_TYPE_REGISTER - .register( - "added", - () -> () -> AddedFloat.CODEC); - public static final DeferredHolder, FloatProviderType> CASTED = FLOAT_PROVIDER_TYPE_REGISTER - .register( - "casted", - () -> () -> CastedFloat.CODEC); + // spotless:off + public static final DeferredRegister> INT_PROVIDER_TYPES = DeferredRegister.create(Registries.INT_PROVIDER_TYPE, GTCEu.MOD_ID); + public static final DeferredRegister> FLOAT_PROVIDER_TYPES = DeferredRegister.create(Registries.FLOAT_PROVIDER_TYPE, GTCEu.MOD_ID); + + + public static final DeferredHolder, IntProviderType> FLOORED = INT_PROVIDER_TYPES.register("floored", () -> () -> FlooredInt.CODEC); + + public static final DeferredHolder, FloatProviderType> MULTIPLIED = FLOAT_PROVIDER_TYPES.register("multiplied", () -> () -> MultipliedFloat.CODEC); + public static final DeferredHolder, FloatProviderType> ADDED = FLOAT_PROVIDER_TYPES.register("added", () -> () -> AddedFloat.CODEC); + public static final DeferredHolder, FloatProviderType> CASTED = FLOAT_PROVIDER_TYPES.register("casted", () -> () -> CastedFloat.CODEC); + + // spotless:on public static void init(IEventBus bus) { - INT_PROVIDER_TYPE_REGISTER.register(bus); - FLOAT_PROVIDER_TYPE_REGISTER.register(bus); + INT_PROVIDER_TYPES.register(bus); + FLOAT_PROVIDER_TYPES.register(bus); } } diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/loot/GTLootConditions.java b/src/main/java/com/gregtechceu/gtceu/common/data/loot/GTLootConditions.java new file mode 100644 index 00000000000..f3faa73012a --- /dev/null +++ b/src/main/java/com/gregtechceu/gtceu/common/data/loot/GTLootConditions.java @@ -0,0 +1,25 @@ +package com.gregtechceu.gtceu.common.data.loot; + +import com.gregtechceu.gtceu.GTCEu; +import com.gregtechceu.gtceu.common.loot.condition.GTConfigValueCondition; + +import net.minecraft.core.registries.Registries; +import net.minecraft.world.level.storage.loot.predicates.LootItemConditionType; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.registries.DeferredHolder; +import net.neoforged.neoforge.registries.DeferredRegister; + +public class GTLootConditions { + // spotless:off + + public static final DeferredRegister LOOT_CONDITION_TYPES = DeferredRegister.create(Registries.LOOT_CONDITION_TYPE, GTCEu.MOD_ID); + + + public static final DeferredHolder CONFIG_VALUE = LOOT_CONDITION_TYPES.register("config_value", () -> new LootItemConditionType(GTConfigValueCondition.CODEC)); + + // spotless:on + + public static void init(IEventBus modBus) { + LOOT_CONDITION_TYPES.register(modBus); + } +} diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/loot/GTLootFunctions.java b/src/main/java/com/gregtechceu/gtceu/common/data/loot/GTLootFunctions.java new file mode 100644 index 00000000000..c0e19d244ff --- /dev/null +++ b/src/main/java/com/gregtechceu/gtceu/common/data/loot/GTLootFunctions.java @@ -0,0 +1,25 @@ +package com.gregtechceu.gtceu.common.data.loot; + +import com.gregtechceu.gtceu.GTCEu; +import com.gregtechceu.gtceu.common.loot.function.SetEUChargeFunction; + +import net.minecraft.core.registries.Registries; +import net.minecraft.world.level.storage.loot.functions.LootItemFunctionType; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.registries.DeferredHolder; +import net.neoforged.neoforge.registries.DeferredRegister; + +public class GTLootFunctions { + // spotless:off + + public static final DeferredRegister> LOOT_FUNCTION_TYPES = DeferredRegister.create(Registries.LOOT_FUNCTION_TYPE, GTCEu.MOD_ID); + + + public static final DeferredHolder, LootItemFunctionType> SET_EU_CHARGE = LOOT_FUNCTION_TYPES.register("set_eu_charge", () -> new LootItemFunctionType<>(SetEUChargeFunction.CODEC)); + + // spotless:on + + public static void init(IEventBus modBus) { + LOOT_FUNCTION_TYPES.register(modBus); + } +} diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTBiomeModifiers.java b/src/main/java/com/gregtechceu/gtceu/common/data/worldgen/GTBiomeModifiers.java similarity index 78% rename from src/main/java/com/gregtechceu/gtceu/common/data/GTBiomeModifiers.java rename to src/main/java/com/gregtechceu/gtceu/common/data/worldgen/GTBiomeModifiers.java index d7850838f9f..b370f91989c 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTBiomeModifiers.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/worldgen/GTBiomeModifiers.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.common.data; +package com.gregtechceu.gtceu.common.data.worldgen; import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.data.recipe.CustomTags; @@ -18,16 +18,10 @@ public class GTBiomeModifiers { - public static final ResourceKey RUBBER_TREE = ResourceKey.create( - NeoForgeRegistries.Keys.BIOME_MODIFIERS, - GTCEu.id("rubber_tree")); - public static final ResourceKey RUBBER_TREE_SWAMP = ResourceKey.create( - NeoForgeRegistries.Keys.BIOME_MODIFIERS, GTCEu.id("rubber_tree_swamp")); - public static final ResourceKey STONE_BLOB = ResourceKey.create( - NeoForgeRegistries.Keys.BIOME_MODIFIERS, - GTCEu.id("stone_blob")); - public static final ResourceKey RAW_OIL_SPROUT = ResourceKey - .create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, GTCEu.id("raw_oil_sprout")); + public static final ResourceKey RUBBER_TREE = create("rubber_tree"); + public static final ResourceKey RUBBER_TREE_SWAMP = create("rubber_tree_swamp"); + public static final ResourceKey STONE_BLOB = create("stone_blob"); + public static final ResourceKey RAW_OIL_SPROUT = create("raw_oil_sprout"); public static void bootstrap(BootstrapContext ctx) { HolderGetter biomeLookup = ctx.lookup(Registries.BIOME); @@ -35,25 +29,29 @@ public static void bootstrap(BootstrapContext ctx) { ctx.register(RUBBER_TREE, new BiomeModifiers.AddFeaturesBiomeModifier( biomeLookup.getOrThrow(CustomTags.HAS_RUBBER_TREE), - HolderSet.direct(placedFeatureRegistry.getOrThrow(GTPlacements.RUBBER_TREE)), + HolderSet.direct(placedFeatureRegistry.getOrThrow(GTPlacedFeatures.RUBBER_TREE)), GenerationStep.Decoration.VEGETAL_DECORATION)); ctx.register(RUBBER_TREE_SWAMP, new BiomeModifiers.AddFeaturesBiomeModifier( biomeLookup.getOrThrow(Tags.Biomes.IS_SWAMP), - HolderSet.direct(placedFeatureRegistry.getOrThrow(GTPlacements.RUBBER_TREE_SWAMP)), + HolderSet.direct(placedFeatureRegistry.getOrThrow(GTPlacedFeatures.RUBBER_TREE_SWAMP)), GenerationStep.Decoration.VEGETAL_DECORATION)); HolderSet overworld = biomeLookup.getOrThrow(BiomeTags.IS_OVERWORLD); - Holder redGraniteBlob = placedFeatureRegistry.getOrThrow(GTPlacements.RED_GRANITE_BLOB); - Holder marbleBlob = placedFeatureRegistry.getOrThrow(GTPlacements.MARBLE_BLOB); + Holder redGraniteBlob = placedFeatureRegistry.getOrThrow(GTPlacedFeatures.RED_GRANITE_BLOB); + Holder marbleBlob = placedFeatureRegistry.getOrThrow(GTPlacedFeatures.MARBLE_BLOB); ctx.register(STONE_BLOB, new BiomeModifiers.AddFeaturesBiomeModifier( overworld, HolderSet.direct(redGraniteBlob, marbleBlob), GenerationStep.Decoration.UNDERGROUND_ORES)); - Holder rawOilSprout = placedFeatureRegistry.getOrThrow(GTPlacements.RAW_OIL_SPROUT); + Holder rawOilSprout = placedFeatureRegistry.getOrThrow(GTPlacedFeatures.RAW_OIL_SPROUT); ctx.register(RAW_OIL_SPROUT, new BiomeModifiers.AddFeaturesBiomeModifier( overworld, HolderSet.direct(rawOilSprout), GenerationStep.Decoration.FLUID_SPRINGS)); } + + private static ResourceKey create(String path) { + return ResourceKey.create(NeoForgeRegistries.Keys.BIOME_MODIFIERS, GTCEu.id(path)); + } } diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTConfiguredFeatures.java b/src/main/java/com/gregtechceu/gtceu/common/data/worldgen/GTConfiguredFeatures.java similarity index 54% rename from src/main/java/com/gregtechceu/gtceu/common/data/GTConfiguredFeatures.java rename to src/main/java/com/gregtechceu/gtceu/common/data/worldgen/GTConfiguredFeatures.java index ff006f089bd..87d06be03d6 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTConfiguredFeatures.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/worldgen/GTConfiguredFeatures.java @@ -1,6 +1,8 @@ -package com.gregtechceu.gtceu.common.data; +package com.gregtechceu.gtceu.common.data.worldgen; import com.gregtechceu.gtceu.GTCEu; +import com.gregtechceu.gtceu.common.data.GTBlocks; +import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.common.worldgen.feature.configurations.FluidSproutConfiguration; import com.gregtechceu.gtceu.common.worldgen.feature.configurations.StoneBlobConfiguration; @@ -23,33 +25,47 @@ public class GTConfiguredFeatures { - public static final ResourceKey> RUBBER_TREE = ResourceKey.create( - Registries.CONFIGURED_FEATURE, GTCEu.id("rubber_tree")); - public static final ResourceKey> RED_GRANITE_BLOB = ResourceKey - .create(Registries.CONFIGURED_FEATURE, GTCEu.id("red_granite_blob")); - public static final ResourceKey> MARBLE_BLOB = ResourceKey - .create(Registries.CONFIGURED_FEATURE, GTCEu.id("marble_blob")); - public static final ResourceKey> RAW_OIL_SPROUT = ResourceKey - .create(Registries.CONFIGURED_FEATURE, GTCEu.id("raw_oil_sprout")); + // spotless:off + public static final ResourceKey> RUBBER_TREE = create("rubber_tree"); + public static final ResourceKey> RED_GRANITE_BLOB = create("red_granite_blob"); + public static final ResourceKey> MARBLE_BLOB = create("marble_blob"); + public static final ResourceKey> RAW_OIL_SPROUT = create("raw_oil_sprout"); public static void bootstrap(BootstrapContext> ctx) { - FeatureUtils.register(ctx, RUBBER_TREE, Feature.TREE, new TreeConfiguration.TreeConfigurationBuilder( - BlockStateProvider - .simple(GTBlocks.RUBBER_LOG.get().changeNatural(GTBlocks.RUBBER_LOG.getDefaultState(), true)), - new ForkingTrunkPlacer(5, 1, 3), - BlockStateProvider.simple(GTBlocks.RUBBER_LEAVES.get()), - new MegaJungleFoliagePlacer(ConstantInt.of(1), UniformInt.of(0, 1), 1), - new TwoLayersFeatureSize(1, 0, 2)).ignoreVines().build()); + FeatureUtils.register(ctx, RUBBER_TREE, Feature.TREE, + new TreeConfiguration.TreeConfigurationBuilder( + BlockStateProvider.simple(GTBlocks.RUBBER_LOG.get().changeNatural(GTBlocks.RUBBER_LOG.getDefaultState(), true)), + new ForkingTrunkPlacer(5, 1, 3), + BlockStateProvider.simple(GTBlocks.RUBBER_LEAVES.get()), + new MegaJungleFoliagePlacer(ConstantInt.of(1), UniformInt.of(0, 1), 1), + new TwoLayersFeatureSize(1, 0, 2) + ).ignoreVines().build() + ); FeatureUtils.register(ctx, RED_GRANITE_BLOB, GTFeatures.STONE_BLOB.get(), - new StoneBlobConfiguration(OreConfiguration.target(new TagMatchTest(BlockTags.STONE_ORE_REPLACEABLES), - GTBlocks.RED_GRANITE.getDefaultState()), UniformInt.of(20, 30))); + new StoneBlobConfiguration( + OreConfiguration.target(new TagMatchTest(BlockTags.STONE_ORE_REPLACEABLES), + GTBlocks.RED_GRANITE.getDefaultState()), UniformInt.of(20, 30) + ) + ); FeatureUtils.register(ctx, MARBLE_BLOB, GTFeatures.STONE_BLOB.get(), - new StoneBlobConfiguration(OreConfiguration.target(new TagMatchTest(BlockTags.STONE_ORE_REPLACEABLES), - GTBlocks.MARBLE.getDefaultState()), UniformInt.of(20, 30))); + new StoneBlobConfiguration( + OreConfiguration.target(new TagMatchTest(BlockTags.STONE_ORE_REPLACEABLES), + GTBlocks.MARBLE.getDefaultState()), UniformInt.of(20, 30) + ) + ); FeatureUtils.register(ctx, RAW_OIL_SPROUT, GTFeatures.FLUID_SPROUT.get(), - new FluidSproutConfiguration(GTMaterials.RawOil.getFluid(), UniformInt.of(9, 13), UniformInt.of(6, 9), - 0.4f)); + new FluidSproutConfiguration( + GTMaterials.RawOil.getFluid(), + UniformInt.of(9, 13), UniformInt.of(6, 9), + 0.4f + ) + ); + } + // spotless:on + + private static ResourceKey> create(String path) { + return ResourceKey.create(Registries.CONFIGURED_FEATURE, GTCEu.id(path)); } } diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTWorldgen.java b/src/main/java/com/gregtechceu/gtceu/common/data/worldgen/GTDensityFunctions.java similarity index 75% rename from src/main/java/com/gregtechceu/gtceu/common/data/GTWorldgen.java rename to src/main/java/com/gregtechceu/gtceu/common/data/worldgen/GTDensityFunctions.java index f079f73b879..eefb0b6907d 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTWorldgen.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/worldgen/GTDensityFunctions.java @@ -1,4 +1,4 @@ -package com.gregtechceu.gtceu.common.data; +package com.gregtechceu.gtceu.common.data.worldgen; import com.gregtechceu.gtceu.GTCEu; @@ -12,8 +12,9 @@ import net.minecraft.world.level.levelgen.Noises; import net.minecraft.world.level.levelgen.synth.NormalNoise; -public class GTWorldgen { +public class GTDensityFunctions { + // spotless:off public static final ResourceKey NEW_ORE_VEIN_TOGGLE = create("vein_toggle"); public static final ResourceKey NEW_ORE_VEIN_RIDGED = create("vein_ridged"); @@ -23,7 +24,9 @@ public static void bootstrap(BootstrapContext ctx) { Holder oreVeininess = noises.getOrThrow(Noises.ORE_VEININESS); ctx.register(NEW_ORE_VEIN_TOGGLE, DensityFunctions.interpolated( - DensityFunctions.noise(oreVeininess, 1.5f, 1.5f))); + DensityFunctions.noise(oreVeininess, 1.5f, 1.5f) + ) + ); Holder oreVeinA = noises.getOrThrow(Noises.ORE_VEIN_A); Holder oreVeinB = noises.getOrThrow(Noises.ORE_VEIN_B); @@ -31,11 +34,15 @@ public static void bootstrap(BootstrapContext ctx) { DensityFunctions.add( DensityFunctions.constant(-0.08f), DensityFunctions.max( - DensityFunctions.interpolated( - DensityFunctions.noise(oreVeinA, 4.0f, 4.0f)).abs(), - DensityFunctions.interpolated( - DensityFunctions.noise(oreVeinB, 4.0f, 4.0f)).abs()))); + DensityFunctions.interpolated(DensityFunctions.noise(oreVeinA, 4.0f, 4.0f)) + .abs(), + DensityFunctions.interpolated(DensityFunctions.noise(oreVeinB, 4.0f, 4.0f)) + .abs() + ) + ) + ); } + // spotless:on private static ResourceKey create(String path) { return ResourceKey.create(Registries.DENSITY_FUNCTION, GTCEu.id(path)); diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/worldgen/GTFeatures.java b/src/main/java/com/gregtechceu/gtceu/common/data/worldgen/GTFeatures.java new file mode 100644 index 00000000000..3265a70fb5f --- /dev/null +++ b/src/main/java/com/gregtechceu/gtceu/common/data/worldgen/GTFeatures.java @@ -0,0 +1,26 @@ +package com.gregtechceu.gtceu.common.data.worldgen; + +import com.gregtechceu.gtceu.GTCEu; +import com.gregtechceu.gtceu.common.worldgen.feature.FluidSproutFeature; +import com.gregtechceu.gtceu.common.worldgen.feature.StoneBlobFeature; + +import net.minecraft.core.registries.Registries; +import net.minecraft.world.level.levelgen.feature.Feature; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.registries.DeferredHolder; +import net.neoforged.neoforge.registries.DeferredRegister; + +public class GTFeatures { + // spotless:off + + public static final DeferredRegister> FEATURES = DeferredRegister.create(Registries.FEATURE, GTCEu.MOD_ID); + + public static final DeferredHolder, StoneBlobFeature> STONE_BLOB = FEATURES.register("stone_blob", StoneBlobFeature::new); + public static final DeferredHolder, FluidSproutFeature> FLUID_SPROUT = FEATURES.register("fluid_sprout", FluidSproutFeature::new); + + // spotless:on + + public static void init(IEventBus modBus) { + FEATURES.register(modBus); + } +} diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTPlacements.java b/src/main/java/com/gregtechceu/gtceu/common/data/worldgen/GTPlacedFeatures.java similarity index 85% rename from src/main/java/com/gregtechceu/gtceu/common/data/GTPlacements.java rename to src/main/java/com/gregtechceu/gtceu/common/data/worldgen/GTPlacedFeatures.java index f280220dddd..a2b56c88c1d 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTPlacements.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/worldgen/GTPlacedFeatures.java @@ -1,6 +1,7 @@ -package com.gregtechceu.gtceu.common.data; +package com.gregtechceu.gtceu.common.data.worldgen; import com.gregtechceu.gtceu.GTCEu; +import com.gregtechceu.gtceu.common.data.GTBlocks; import com.gregtechceu.gtceu.common.worldgen.modifier.RubberTreeChancePlacement; import net.minecraft.core.Holder; @@ -14,18 +15,13 @@ import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; import net.minecraft.world.level.levelgen.placement.*; -public class GTPlacements { +public class GTPlacedFeatures { - public static final ResourceKey RUBBER_TREE = ResourceKey.create(Registries.PLACED_FEATURE, - GTCEu.id("rubber_tree")); - public static final ResourceKey RUBBER_TREE_SWAMP = ResourceKey.create(Registries.PLACED_FEATURE, - GTCEu.id("rubber_tree_swamp")); - public static final ResourceKey RED_GRANITE_BLOB = ResourceKey.create(Registries.PLACED_FEATURE, - GTCEu.id("red_granite_blob")); - public static final ResourceKey MARBLE_BLOB = ResourceKey.create(Registries.PLACED_FEATURE, - GTCEu.id("marble_blob")); - public static final ResourceKey RAW_OIL_SPROUT = ResourceKey.create(Registries.PLACED_FEATURE, - GTCEu.id("raw_oil_sprout")); + public static final ResourceKey RUBBER_TREE = create("rubber_tree"); + public static final ResourceKey RUBBER_TREE_SWAMP = create("rubber_tree_swamp"); + public static final ResourceKey RED_GRANITE_BLOB = create("red_granite_blob"); + public static final ResourceKey MARBLE_BLOB = create("marble_blob"); + public static final ResourceKey RAW_OIL_SPROUT = create("raw_oil_sprout"); public static void bootstrap(BootstrapContext ctx) { HolderGetter> featureLookup = ctx.lookup(Registries.CONFIGURED_FEATURE); @@ -63,4 +59,8 @@ public static void bootstrap(BootstrapContext ctx) { BiomeFilter.biome(), HeightRangePlacement.uniform(VerticalAnchor.absolute(10), VerticalAnchor.absolute(40))); } + + private static ResourceKey create(String path) { + return ResourceKey.create(Registries.PLACED_FEATURE, GTCEu.id(path)); + } } diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/worldgen/GTPlacementModifiers.java b/src/main/java/com/gregtechceu/gtceu/common/data/worldgen/GTPlacementModifiers.java new file mode 100644 index 00000000000..cad0054272d --- /dev/null +++ b/src/main/java/com/gregtechceu/gtceu/common/data/worldgen/GTPlacementModifiers.java @@ -0,0 +1,27 @@ +package com.gregtechceu.gtceu.common.data.worldgen; + +import com.gregtechceu.gtceu.GTCEu; +import com.gregtechceu.gtceu.common.worldgen.modifier.BiomeDependentPlacement; +import com.gregtechceu.gtceu.common.worldgen.modifier.RubberTreeChancePlacement; + +import net.minecraft.core.registries.Registries; +import net.minecraft.world.level.levelgen.placement.PlacementModifierType; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.registries.DeferredHolder; +import net.neoforged.neoforge.registries.DeferredRegister; + +public class GTPlacementModifiers { + // spotless:off + + public static final DeferredRegister> PLACEMENT_MODIFIERS = DeferredRegister.create(Registries.PLACEMENT_MODIFIER_TYPE, GTCEu.MOD_ID); + + + public static final DeferredHolder, PlacementModifierType> BIOME_DEPENDENT = PLACEMENT_MODIFIERS.register("biome_dependent", () -> () -> BiomeDependentPlacement.CODEC); + public static final DeferredHolder, PlacementModifierType> RUBBER_TREE_CHANCE = PLACEMENT_MODIFIERS.register("rubber_tree_chance", () -> () -> RubberTreeChancePlacement.CODEC); + + // spotless:on + + public static void init(IEventBus modBus) { + PLACEMENT_MODIFIERS.register(modBus); + } +} diff --git a/src/main/java/com/gregtechceu/gtceu/common/loot/condition/GTConfigValueCondition.java b/src/main/java/com/gregtechceu/gtceu/common/loot/condition/GTConfigValueCondition.java new file mode 100644 index 00000000000..e75dd947d6b --- /dev/null +++ b/src/main/java/com/gregtechceu/gtceu/common/loot/condition/GTConfigValueCondition.java @@ -0,0 +1,68 @@ +package com.gregtechceu.gtceu.common.loot.condition; + +import com.gregtechceu.gtceu.common.data.loot.GTLootConditions; +import com.gregtechceu.gtceu.config.ConfigHolder; + +import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.predicates.LootItemCondition; +import net.minecraft.world.level.storage.loot.predicates.LootItemConditionType; + +import com.mojang.serialization.Codec; +import com.mojang.serialization.MapCodec; +import com.mojang.serialization.codecs.RecordCodecBuilder; +import dev.toma.configuration.config.value.IConfigValue; +import lombok.Getter; +import lombok.experimental.Accessors; + +import java.util.Optional; +import java.util.function.BooleanSupplier; + +@Accessors(fluent = true) +public class GTConfigValueCondition implements LootItemCondition { + + // spotless:off + public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(instance -> instance.group( + Codec.STRING.fieldOf("config_field").forGetter(GTConfigValueCondition::configField) + ).apply(instance, GTConfigValueCondition::new)); + // spotless:on + + @Getter + private final String configField; + private final BooleanSupplier configValueGetter; + + protected GTConfigValueCondition(String configField) { + this.configField = configField; + + Optional> configEntry = ConfigHolder.INTERNAL_INSTANCE + .getConfigValue(configField, Boolean.class); + this.configValueGetter = () -> configEntry.map(IConfigValue::get).orElse(false); + } + + @Override + public boolean test(LootContext lootContext) { + return configValueGetter.getAsBoolean(); + } + + @Override + public LootItemConditionType getType() { + return GTLootConditions.CONFIG_VALUE.get(); + } + + public static LootItemCondition.Builder configEnabled(String configField) { + return () -> new GTConfigValueCondition(configField); + } + + /** + * {@return Config value condition that checks the {@code worldgen.addLoot} config} + */ + public static LootItemCondition.Builder addLootConfigEnabled() { + return configEnabled("worldgen.addLoot"); + } + + /** + * {@return Config value condition that checks the {@code worldgen.increaseDungeonLoot} config} + */ + public static LootItemCondition.Builder increaseDungeonLootConfigEnabled() { + return configEnabled("worldgen.increaseDungeonLoot"); + } +} diff --git a/src/main/java/com/gregtechceu/gtceu/common/loot/condition/package-info.java b/src/main/java/com/gregtechceu/gtceu/common/loot/condition/package-info.java new file mode 100644 index 00000000000..aec8cbea134 --- /dev/null +++ b/src/main/java/com/gregtechceu/gtceu/common/loot/condition/package-info.java @@ -0,0 +1,4 @@ +@NotNullByDefault +package com.gregtechceu.gtceu.common.loot.condition; + +import org.jetbrains.annotations.NotNullByDefault; diff --git a/src/main/java/com/gregtechceu/gtceu/common/loot/function/SetEUChargeFunction.java b/src/main/java/com/gregtechceu/gtceu/common/loot/function/SetEUChargeFunction.java new file mode 100644 index 00000000000..932e4852975 --- /dev/null +++ b/src/main/java/com/gregtechceu/gtceu/common/loot/function/SetEUChargeFunction.java @@ -0,0 +1,52 @@ +package com.gregtechceu.gtceu.common.loot.function; + +import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; +import com.gregtechceu.gtceu.api.capability.IElectricItem; +import com.gregtechceu.gtceu.common.data.loot.GTLootFunctions; +import com.gregtechceu.gtceu.utils.codec.GTCodecUtils; + +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.storage.loot.LootContext; +import net.minecraft.world.level.storage.loot.functions.*; +import net.minecraft.world.level.storage.loot.predicates.LootItemCondition; + +import com.google.gson.*; +import com.mojang.serialization.MapCodec; +import com.mojang.serialization.codecs.RecordCodecBuilder; + +import java.util.List; + +public class SetEUChargeFunction extends LootItemConditionalFunction { + + // spotless:off + public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(instance -> commonFields(instance).and( + GTCodecUtils.NON_NEGATIVE_LONG.fieldOf("charge").forGetter(fn -> fn.charge) + ).apply(instance, SetEUChargeFunction::new)); + // spotless:on + + protected final long charge; + + protected SetEUChargeFunction(List predicates, long charge) { + super(predicates); + this.charge = charge; + } + + @Override + public LootItemFunctionType getType() { + return GTLootFunctions.SET_EU_CHARGE.get(); + } + + @Override + public ItemStack run(ItemStack stack, LootContext context) { + IElectricItem electricItem = GTCapabilityHelper.getElectricItem(stack); + if (electricItem == null) { + return stack; + } + electricItem.charge(this.charge, Integer.MAX_VALUE, true, false); + return stack; + } + + public static LootItemConditionalFunction.Builder setCharge(long charge) { + return simpleBuilder(conditions -> new SetEUChargeFunction(conditions, charge)); + } +} diff --git a/src/main/java/com/gregtechceu/gtceu/common/loot/function/package-info.java b/src/main/java/com/gregtechceu/gtceu/common/loot/function/package-info.java new file mode 100644 index 00000000000..e82ff307695 --- /dev/null +++ b/src/main/java/com/gregtechceu/gtceu/common/loot/function/package-info.java @@ -0,0 +1,4 @@ +@NotNullByDefault +package com.gregtechceu.gtceu.common.loot.function; + +import org.jetbrains.annotations.NotNullByDefault; diff --git a/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/modifier/BiomePlacement.java b/src/main/java/com/gregtechceu/gtceu/common/worldgen/modifier/BiomeDependentPlacement.java similarity index 60% rename from src/main/java/com/gregtechceu/gtceu/api/data/worldgen/modifier/BiomePlacement.java rename to src/main/java/com/gregtechceu/gtceu/common/worldgen/modifier/BiomeDependentPlacement.java index b7c7382b2b0..3d1508fabaf 100644 --- a/src/main/java/com/gregtechceu/gtceu/api/data/worldgen/modifier/BiomePlacement.java +++ b/src/main/java/com/gregtechceu/gtceu/common/worldgen/modifier/BiomeDependentPlacement.java @@ -1,11 +1,9 @@ -package com.gregtechceu.gtceu.api.data.worldgen.modifier; +package com.gregtechceu.gtceu.common.worldgen.modifier; -import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.data.worldgen.BiomeWeightModifier; -import com.gregtechceu.gtceu.api.registry.GTRegistries; +import com.gregtechceu.gtceu.common.data.worldgen.GTPlacementModifiers; import net.minecraft.core.BlockPos; -import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.util.RandomSource; import net.minecraft.world.level.levelgen.placement.PlacementContext; import net.minecraft.world.level.levelgen.placement.PlacementModifier; @@ -16,17 +14,14 @@ import java.util.List; import java.util.stream.Stream; -public class BiomePlacement extends PlacementModifier { +public class BiomeDependentPlacement extends PlacementModifier { - public static final PlacementModifierType BIOME_PLACEMENT = GTRegistries.register( - BuiltInRegistries.PLACEMENT_MODIFIER_TYPE, GTCEu.id("biome_placement"), () -> BiomePlacement.CODEC); - - public static final MapCodec CODEC = BiomeWeightModifier.CODEC.listOf().fieldOf("modifiers") - .xmap(BiomePlacement::new, placement -> placement.modifiers); + public static final MapCodec CODEC = BiomeWeightModifier.CODEC.listOf() + .fieldOf("modifiers").xmap(BiomeDependentPlacement::new, placement -> placement.modifiers); public final List modifiers; - public BiomePlacement(List modifiers) { + public BiomeDependentPlacement(List modifiers) { this.modifiers = modifiers; } @@ -45,6 +40,6 @@ public Stream getPositions(PlacementContext context, RandomSource rand @Override public PlacementModifierType type() { - return BIOME_PLACEMENT; + return GTPlacementModifiers.BIOME_DEPENDENT.get(); } } diff --git a/src/main/java/com/gregtechceu/gtceu/common/worldgen/modifier/RubberTreeChancePlacement.java b/src/main/java/com/gregtechceu/gtceu/common/worldgen/modifier/RubberTreeChancePlacement.java index f451e9ecc12..e22c6f90740 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/worldgen/modifier/RubberTreeChancePlacement.java +++ b/src/main/java/com/gregtechceu/gtceu/common/worldgen/modifier/RubberTreeChancePlacement.java @@ -1,11 +1,9 @@ package com.gregtechceu.gtceu.common.worldgen.modifier; -import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.registry.GTRegistries; +import com.gregtechceu.gtceu.common.data.worldgen.GTPlacementModifiers; import com.gregtechceu.gtceu.config.ConfigHolder; import net.minecraft.core.BlockPos; -import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.util.RandomSource; import net.minecraft.world.level.levelgen.placement.PlacementModifierType; import net.minecraft.world.level.levelgen.placement.RepeatingPlacement; @@ -15,10 +13,6 @@ public class RubberTreeChancePlacement extends RepeatingPlacement { - public static final PlacementModifierType RUBBER_TREE_CHANCE_PLACEMENT = GTRegistries - .register(BuiltInRegistries.PLACEMENT_MODIFIER_TYPE, GTCEu.id("rubber_tree_chance"), - () -> RubberTreeChancePlacement.CODEC); - public static final RubberTreeChancePlacement INSTANCE = new RubberTreeChancePlacement(); public static final MapCodec CODEC = MapCodec.unit(INSTANCE); @@ -29,6 +23,6 @@ protected int count(RandomSource random, @NotNull BlockPos pos) { @Override public PlacementModifierType type() { - return RUBBER_TREE_CHANCE_PLACEMENT; + return GTPlacementModifiers.RUBBER_TREE_CHANCE.get(); } } diff --git a/src/main/java/com/gregtechceu/gtceu/config/ConfigHolder.java b/src/main/java/com/gregtechceu/gtceu/config/ConfigHolder.java index 35aac79905e..425a39d8a2d 100644 --- a/src/main/java/com/gregtechceu/gtceu/config/ConfigHolder.java +++ b/src/main/java/com/gregtechceu/gtceu/config/ConfigHolder.java @@ -407,13 +407,11 @@ public static class WorldGenConfigs { @Configurable @Configurable.Comment({ "Whether to increase number of rolls for dungeon chests. Increases dungeon loot drastically.", - "Default: true", "WARNING: Currently unimplemented." }) - @Configurable.UpdateRestriction(UpdateRestrictions.MAIN_MENU) + "Default: true" }) public boolean increaseDungeonLoot = true; @Configurable @Configurable.Comment({ "Allow GregTech to add additional GregTech Items as loot in various structures.", "Default: true" }) - @Configurable.UpdateRestriction(UpdateRestrictions.MAIN_MENU) public boolean addLoot = true; @Configurable diff --git a/src/main/java/com/gregtechceu/gtceu/core/mixins/ReloadableServerResourcesMixin.java b/src/main/java/com/gregtechceu/gtceu/core/mixins/ReloadableServerResourcesMixin.java index 6df3a51520e..6e1c32c69e7 100644 --- a/src/main/java/com/gregtechceu/gtceu/core/mixins/ReloadableServerResourcesMixin.java +++ b/src/main/java/com/gregtechceu/gtceu/core/mixins/ReloadableServerResourcesMixin.java @@ -4,7 +4,6 @@ import com.gregtechceu.gtceu.api.machine.trait.customlogic.SteamBoilerLogic; import com.gregtechceu.gtceu.common.data.GTRecipes; import com.gregtechceu.gtceu.core.MixinHelpers; -import com.gregtechceu.gtceu.data.loot.DungeonLootLoader; import com.gregtechceu.gtceu.data.pack.GTDynamicDataPack; import com.gregtechceu.gtceu.data.recipe.GTCraftingComponents; @@ -67,8 +66,6 @@ public void accept(@NotNull ResourceLocation id, @NotNull Recipe recipe, } }); MixinHelpers.generateGTDynamicLoot(GTDynamicDataPack::addLootTable, frozen); - // Initialize dungeon loot additions - DungeonLootLoader.init(); GTCEu.LOGGER.info("GregTech Data loading took {}ms", System.currentTimeMillis() - startTime); } diff --git a/src/main/java/com/gregtechceu/gtceu/core/mixins/neoforge/GameDataMixin.java b/src/main/java/com/gregtechceu/gtceu/core/mixins/neoforge/GameDataMixin.java index 9df36fb77ed..f0ece274951 100644 --- a/src/main/java/com/gregtechceu/gtceu/core/mixins/neoforge/GameDataMixin.java +++ b/src/main/java/com/gregtechceu/gtceu/core/mixins/neoforge/GameDataMixin.java @@ -2,12 +2,14 @@ import com.gregtechceu.gtceu.api.registry.GTRegistries; +import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceLocation; import net.neoforged.neoforge.registries.GameData; import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.ModifyArg; import java.util.LinkedHashSet; @@ -20,4 +22,17 @@ public class GameDataMixin { ordered.addAll(GTRegistries.getRegistryOrder()); return ordered; } + + /** + * Injection to init the vanilla recipe type registry in place of fake GT one + */ + @ModifyArg(method = "postRegisterEvents", + at = @At(value = "INVOKE", + target = "Lnet/minecraft/core/Registry;get(Lnet/minecraft/resources/ResourceLocation;)Ljava/lang/Object;")) + private static ResourceLocation gtceu$loadVanillaRecipeTypeRegistryInstead(ResourceLocation registryName) { + if (registryName.equals(GTRegistries.Keys.RECIPE_TYPE.location())) { + return Registries.RECIPE_TYPE.location(); + } + return registryName; + } } diff --git a/src/main/java/com/gregtechceu/gtceu/data/DataGenerators.java b/src/main/java/com/gregtechceu/gtceu/data/DataGenerators.java index 930a229ec9e..fe5362da09d 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/DataGenerators.java +++ b/src/main/java/com/gregtechceu/gtceu/data/DataGenerators.java @@ -4,6 +4,9 @@ import com.gregtechceu.gtceu.api.registry.GTRegistries; import com.gregtechceu.gtceu.api.registry.registrate.SoundEntryBuilder; import com.gregtechceu.gtceu.common.data.*; +import com.gregtechceu.gtceu.common.data.worldgen.*; +import com.gregtechceu.gtceu.data.loot.GTLootModifications; +import com.gregtechceu.gtceu.data.loot.GTLootTables; import com.gregtechceu.gtceu.data.tags.BiomeTagsLoader; import com.gregtechceu.gtceu.data.tags.DamageTypeTagsLoader; @@ -39,8 +42,8 @@ public static void gatherData(GatherDataEvent event) { packOutput, registries, new RegistrySetBuilder() .add(Registries.DAMAGE_TYPE, GTDamageTypes::bootstrap) .add(Registries.CONFIGURED_FEATURE, GTConfiguredFeatures::bootstrap) - .add(Registries.PLACED_FEATURE, GTPlacements::bootstrap) - .add(Registries.DENSITY_FUNCTION, GTWorldgen::bootstrap) + .add(Registries.PLACED_FEATURE, GTPlacedFeatures::bootstrap) + .add(Registries.DENSITY_FUNCTION, GTDensityFunctions::bootstrap) .add(NeoForgeRegistries.Keys.BIOME_MODIFIERS, GTBiomeModifiers::bootstrap) .add(Registries.JUKEBOX_SONG, GTJukeboxSongs::bootstrap) .add(Registries.ENCHANTMENT_PROVIDER, GTEnchantmentProviders::bootstrap) @@ -49,6 +52,8 @@ packOutput, registries, new RegistrySetBuilder() set)); generator.addProvider(true, new DamageTypeTagsLoader(packOutput, provider.getRegistryProvider(), existingFileHelper)); + generator.addProvider(true, new GTLootTables(packOutput, provider.getRegistryProvider())); + generator.addProvider(true, new GTLootModifications(packOutput, provider.getRegistryProvider())); } } } diff --git a/src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java b/src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java index d19f91f7cd8..0bd9fbcf15d 100644 --- a/src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java +++ b/src/main/java/com/gregtechceu/gtceu/data/lang/ItemLang.java @@ -357,6 +357,6 @@ private static void initItemTooltips(RegistrateLangProvider provider) { provider.add("item.gtceu.terminal.tooltip", "Shift + R-Click on a controller to automatically build the multiblock"); - provider.add("item.gtceu.sus_record.desc", "§7sussy!"); + provider.add("item.gtceu.sus_record.desc", "sussy!"); } } diff --git a/src/main/java/com/gregtechceu/gtceu/data/loot/ChestGenHooks.java b/src/main/java/com/gregtechceu/gtceu/data/loot/ChestGenHooks.java deleted file mode 100644 index 8025973e1eb..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/data/loot/ChestGenHooks.java +++ /dev/null @@ -1,185 +0,0 @@ -package com.gregtechceu.gtceu.data.loot; - -import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.registry.GTRegistries; -import com.gregtechceu.gtceu.config.ConfigHolder; -import com.gregtechceu.gtceu.core.mixins.LootPoolAccessor; -import com.gregtechceu.gtceu.utils.GTMath; -import com.gregtechceu.gtceu.utils.ItemStackHashStrategy; - -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceKey; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.util.ExtraCodecs; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.storage.loot.LootContext; -import net.minecraft.world.level.storage.loot.LootPool; -import net.minecraft.world.level.storage.loot.LootTable; -import net.minecraft.world.level.storage.loot.entries.LootItem; -import net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer; -import net.minecraft.world.level.storage.loot.functions.LootItemConditionalFunction; -import net.minecraft.world.level.storage.loot.functions.LootItemFunction; -import net.minecraft.world.level.storage.loot.functions.LootItemFunctionType; -import net.minecraft.world.level.storage.loot.predicates.LootItemCondition; -import net.minecraft.world.level.storage.loot.providers.number.NumberProvider; -import net.minecraft.world.level.storage.loot.providers.number.UniformGenerator; -import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.neoforge.common.NeoForge; -import net.neoforged.neoforge.event.LootTableLoadEvent; - -import com.google.common.base.Preconditions; -import com.mojang.serialization.MapCodec; -import com.mojang.serialization.codecs.RecordCodecBuilder; -import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; -import lombok.Getter; -import org.jetbrains.annotations.NotNull; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.function.Consumer; - -public final class ChestGenHooks { - - private static final Map> lootEntryItems = new Object2ObjectOpenHashMap<>(); - private static final Map rollValues = new Object2ObjectOpenHashMap<>(); - - private static final List NO_CONDITIONS = List.of(); - - private ChestGenHooks() {} - - public static void init() { - NeoForge.EVENT_BUS.register(ChestGenHooks.class); - RandomWeightLootFunction.init(); - } - - @SubscribeEvent - public static void onWorldLoad(@NotNull LootTableLoadEvent event) { - LootPool mainPool = event.getTable().getPool("main"); - if (mainPool == null) return; - - ResourceLocation name = event.getName(); - if (lootEntryItems.containsKey(name)) { - List entryItems = lootEntryItems.get(name); - for (GTLootEntryItem entry : entryItems) { - if (ConfigHolder.INSTANCE.dev.debug) { - GTCEu.LOGGER.info("adding {} to lootTable {}", entry, name); - } - - try { - List entries = new ArrayList<>(((LootPoolAccessor) mainPool).getEntries()); - entries.add(entry); - ((LootPoolAccessor) mainPool).setEntries(entries); - } catch (RuntimeException e) { - GTCEu.LOGGER.error("Couldn't add {} to lootTable {}: {}", entry, name, e.getMessage()); - } - } - } - - if (rollValues.containsKey(event.getName())) { - NumberProvider rangeAdd = rollValues.get(event.getName()); - NumberProvider range = mainPool.getRolls(); - // mainPool.setRolls(UniformGenerator.between(range.getMin() + rangeAdd.getMin(), range.getMax() + - // rangeAdd.getMax())); TODO additional rolls - } - } - - public static void addItem(@NotNull ResourceKey lootTable, @NotNull ItemStack stack, int minAmount, - int maxAmount, int weight) { - RandomWeightLootFunction lootFunction = new RandomWeightLootFunction(stack, minAmount, maxAmount); - String modid = Objects.requireNonNull(BuiltInRegistries.ITEM.getKey(stack.getItem())).getNamespace(); - String entryName = createEntryName(stack, modid, weight, lootFunction); - GTLootEntryItem itemEntry = new GTLootEntryItem(stack, weight, lootFunction, entryName); - lootEntryItems.computeIfAbsent(lootTable.location(), $ -> new ArrayList<>()).add(itemEntry); - } - - public static void addRolls(ResourceKey lootTable, int minAdd, int maxAdd) { - rollValues.put(lootTable.location(), UniformGenerator.between(minAdd, maxAdd)); - } - - private static final ItemStackHashStrategy HASH_STRATEGY = ItemStackHashStrategy.comparingAllButCount(); - - private static @NotNull String createEntryName(@NotNull ItemStack stack, @NotNull String modid, int weight, - @NotNull RandomWeightLootFunction function) { - int hashCode = GTMath.hashInts(HASH_STRATEGY.hashCode(stack), modid.hashCode(), weight, function.getMinAmount(), - function.getMaxAmount()); - return String.format("#%s:loot_%s", modid, hashCode); - } - - private static class GTLootEntryItem extends LootItem { - - private final ItemStack stack; - private final String entryName; - - public GTLootEntryItem(@NotNull ItemStack stack, int weight, LootItemFunction lootFunction, - @NotNull String entryName) { - super(stack.getItemHolder(), weight, 1, NO_CONDITIONS, List.of(lootFunction)); - this.stack = stack; - this.entryName = entryName; - } - - public void createItemStack(Consumer stackConsumer, @NotNull LootContext lootContext) { - stackConsumer.accept(this.stack.copy()); - } - - @Override - public @NotNull String toString() { - return "GTLootEntryItem{name=" + entryName + ", stack=" + stack.toString() + '}'; - } - } - - public static class RandomWeightLootFunction extends LootItemConditionalFunction implements LootItemFunction { - - public static final MapCodec CODEC = RecordCodecBuilder.mapCodec(instance -> instance - .group( - ItemStack.CODEC.fieldOf("stack").forGetter(val -> val.stack), - ExtraCodecs.NON_NEGATIVE_INT.fieldOf("min").forGetter(val -> val.minAmount), - ExtraCodecs.NON_NEGATIVE_INT.fieldOf("max").forGetter(val -> val.maxAmount)) - .apply(instance, RandomWeightLootFunction::new)); - - public static final LootItemFunctionType TYPE = GTRegistries.register( - BuiltInRegistries.LOOT_FUNCTION_TYPE, GTCEu.id("random_weight"), new LootItemFunctionType<>(CODEC)); - - private final ItemStack stack; - @Getter - private final int minAmount; - @Getter - private final int maxAmount; - - public RandomWeightLootFunction(@NotNull ItemStack stack, int minAmount, int maxAmount) { - super(NO_CONDITIONS); - Preconditions.checkArgument(minAmount <= maxAmount, "minAmount must be <= maxAmount"); - this.stack = stack; - this.minAmount = minAmount; - this.maxAmount = maxAmount; - } - - public static void init() {} - - @Override - public @NotNull LootItemFunctionType getType() { - return TYPE; - } - - @Override - protected @NotNull ItemStack run(@NotNull ItemStack itemStack, @NotNull LootContext context) { - if (stack.getDamageValue() != 0) { - itemStack.setDamageValue(stack.getDamageValue()); - } - if (!stack.isComponentsPatchEmpty()) { - itemStack.applyComponents(stack.getComponentsPatch()); - } - - if (minAmount == maxAmount) { - itemStack.setCount(minAmount); - return itemStack; - } - - int count = Math.min(minAmount + context.getRandom().nextInt(maxAmount - minAmount + 1), - stack.getMaxStackSize()); - itemStack.setCount(count); - return itemStack; - } - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/data/loot/DungeonLootLoader.java b/src/main/java/com/gregtechceu/gtceu/data/loot/DungeonLootLoader.java deleted file mode 100644 index 099d1929d9f..00000000000 --- a/src/main/java/com/gregtechceu/gtceu/data/loot/DungeonLootLoader.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.gregtechceu.gtceu.data.loot; - -import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; -import com.gregtechceu.gtceu.api.data.tag.TagPrefix; -import com.gregtechceu.gtceu.common.data.GTItems; -import com.gregtechceu.gtceu.common.data.GTMaterials; -import com.gregtechceu.gtceu.config.ConfigHolder; - -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; -import net.minecraft.world.level.storage.loot.BuiltInLootTables; - -public class DungeonLootLoader { - - private DungeonLootLoader() {} - - public static void init() { - if (ConfigHolder.INSTANCE.worldgen.addLoot || ConfigHolder.INSTANCE.worldgen.increaseDungeonLoot) { - GTCEu.LOGGER.info("Registering dungeon loot..."); - } - if (ConfigHolder.INSTANCE.worldgen.addLoot) { - ChestGenHooks.addItem(BuiltInLootTables.SPAWN_BONUS_CHEST, GTItems.BOTTLE_PURPLE_DRINK.asStack(), 8, 16, 2); - - ChestGenHooks.addItem(BuiltInLootTables.SIMPLE_DUNGEON, GTItems.BOTTLE_PURPLE_DRINK.asStack(), 4, 8, 80); - ChestGenHooks.addItem(BuiltInLootTables.SIMPLE_DUNGEON, - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Silver), 1, 6, 120); - ChestGenHooks.addItem(BuiltInLootTables.SIMPLE_DUNGEON, - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Lead), 1, 6, 30); - ChestGenHooks.addItem(BuiltInLootTables.SIMPLE_DUNGEON, - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel), 1, 6, 60); - ChestGenHooks.addItem(BuiltInLootTables.SIMPLE_DUNGEON, - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Bronze), 1, 6, 60); - ChestGenHooks.addItem(BuiltInLootTables.SIMPLE_DUNGEON, - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Manganese), 1, 6, 60); - ChestGenHooks.addItem(BuiltInLootTables.SIMPLE_DUNGEON, - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.DamascusSteel), 1, 6, 10); - ChestGenHooks.addItem(BuiltInLootTables.SIMPLE_DUNGEON, - ChemicalHelper.get(TagPrefix.gem, GTMaterials.Emerald), 1, 6, 20); - ChestGenHooks.addItem(BuiltInLootTables.SIMPLE_DUNGEON, ChemicalHelper.get(TagPrefix.gem, GTMaterials.Ruby), - 1, 6, 20); - ChestGenHooks.addItem(BuiltInLootTables.SIMPLE_DUNGEON, - ChemicalHelper.get(TagPrefix.gem, GTMaterials.Sapphire), 1, 6, 20); - ChestGenHooks.addItem(BuiltInLootTables.SIMPLE_DUNGEON, - ChemicalHelper.get(TagPrefix.gem, GTMaterials.GreenSapphire), 1, 6, 20); - ChestGenHooks.addItem(BuiltInLootTables.SIMPLE_DUNGEON, - ChemicalHelper.get(TagPrefix.gem, GTMaterials.Olivine), 1, 6, 20); - ChestGenHooks.addItem(BuiltInLootTables.SIMPLE_DUNGEON, - ChemicalHelper.get(TagPrefix.gem, GTMaterials.GarnetRed), 1, 6, 40); - ChestGenHooks.addItem(BuiltInLootTables.SIMPLE_DUNGEON, - ChemicalHelper.get(TagPrefix.gem, GTMaterials.GarnetYellow), 1, 6, 40); - ChestGenHooks.addItem(BuiltInLootTables.SIMPLE_DUNGEON, - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Neodymium), 1, 6, 40); - ChestGenHooks.addItem(BuiltInLootTables.SIMPLE_DUNGEON, - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Chromium), 1, 3, 40); - - ChestGenHooks.addItem(BuiltInLootTables.DESERT_PYRAMID, - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Silver), 4, 16, 12); - ChestGenHooks.addItem(BuiltInLootTables.DESERT_PYRAMID, - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Platinum), 2, 8, 4); - ChestGenHooks.addItem(BuiltInLootTables.DESERT_PYRAMID, ChemicalHelper.get(TagPrefix.gem, GTMaterials.Ruby), - 2, 8, 2); - ChestGenHooks.addItem(BuiltInLootTables.DESERT_PYRAMID, - ChemicalHelper.get(TagPrefix.gem, GTMaterials.Sapphire), 2, 8, 2); - ChestGenHooks.addItem(BuiltInLootTables.DESERT_PYRAMID, - ChemicalHelper.get(TagPrefix.gem, GTMaterials.GreenSapphire), 2, 8, 2); - ChestGenHooks.addItem(BuiltInLootTables.DESERT_PYRAMID, - ChemicalHelper.get(TagPrefix.gem, GTMaterials.Olivine), 2, 8, 2); - ChestGenHooks.addItem(BuiltInLootTables.DESERT_PYRAMID, - ChemicalHelper.get(TagPrefix.gem, GTMaterials.GarnetRed), 2, 8, 4); - ChestGenHooks.addItem(BuiltInLootTables.DESERT_PYRAMID, - ChemicalHelper.get(TagPrefix.gem, GTMaterials.GarnetYellow), 2, 8, 4); - - ChestGenHooks.addItem(BuiltInLootTables.JUNGLE_TEMPLE, - GTItems.ZERO_POINT_MODULE.get().getChargedStack(Long.MAX_VALUE), 1, 1, 1); - ChestGenHooks.addItem(BuiltInLootTables.JUNGLE_TEMPLE, - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Bronze), 4, 16, 12); - ChestGenHooks.addItem(BuiltInLootTables.JUNGLE_TEMPLE, ChemicalHelper.get(TagPrefix.gem, GTMaterials.Ruby), - 2, 8, 2); - ChestGenHooks.addItem(BuiltInLootTables.JUNGLE_TEMPLE, - ChemicalHelper.get(TagPrefix.gem, GTMaterials.Sapphire), 2, 8, 2); - ChestGenHooks.addItem(BuiltInLootTables.JUNGLE_TEMPLE, - ChemicalHelper.get(TagPrefix.gem, GTMaterials.GreenSapphire), 2, 8, 2); - ChestGenHooks.addItem(BuiltInLootTables.JUNGLE_TEMPLE, - ChemicalHelper.get(TagPrefix.gem, GTMaterials.Olivine), 2, 8, 2); - ChestGenHooks.addItem(BuiltInLootTables.JUNGLE_TEMPLE, - ChemicalHelper.get(TagPrefix.gem, GTMaterials.GarnetRed), 2, 8, 4); - ChestGenHooks.addItem(BuiltInLootTables.JUNGLE_TEMPLE, - ChemicalHelper.get(TagPrefix.gem, GTMaterials.GarnetYellow), 2, 8, 4); - - ChestGenHooks.addItem(BuiltInLootTables.JUNGLE_TEMPLE_DISPENSER, new ItemStack(Items.FIRE_CHARGE, 1), 2, 8, - 30); - - ChestGenHooks.addItem(BuiltInLootTables.ABANDONED_MINESHAFT, - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Silver), 1, 4, 12); - ChestGenHooks.addItem(BuiltInLootTables.ABANDONED_MINESHAFT, - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Lead), 1, 4, 3); - ChestGenHooks.addItem(BuiltInLootTables.ABANDONED_MINESHAFT, - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel), 1, 4, 6); - ChestGenHooks.addItem(BuiltInLootTables.ABANDONED_MINESHAFT, - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Bronze), 1, 4, 6); - ChestGenHooks.addItem(BuiltInLootTables.ABANDONED_MINESHAFT, - ChemicalHelper.get(TagPrefix.gem, GTMaterials.Sapphire), 1, 4, 2); - ChestGenHooks.addItem(BuiltInLootTables.ABANDONED_MINESHAFT, - ChemicalHelper.get(TagPrefix.gem, GTMaterials.GreenSapphire), 1, 4, 2); - ChestGenHooks.addItem(BuiltInLootTables.ABANDONED_MINESHAFT, - ChemicalHelper.get(TagPrefix.gem, GTMaterials.Olivine), 1, 4, 2); - ChestGenHooks.addItem(BuiltInLootTables.ABANDONED_MINESHAFT, - ChemicalHelper.get(TagPrefix.gem, GTMaterials.GarnetRed), 1, 4, 4); - ChestGenHooks.addItem(BuiltInLootTables.ABANDONED_MINESHAFT, - ChemicalHelper.get(TagPrefix.gem, GTMaterials.GarnetYellow), 1, 4, 4); - ChestGenHooks.addItem(BuiltInLootTables.ABANDONED_MINESHAFT, - ChemicalHelper.get(TagPrefix.gem, GTMaterials.Ruby), 1, 4, 2); - ChestGenHooks.addItem(BuiltInLootTables.ABANDONED_MINESHAFT, - ChemicalHelper.get(TagPrefix.gem, GTMaterials.Emerald), 1, 4, 2); - ChestGenHooks.addItem(BuiltInLootTables.ABANDONED_MINESHAFT, - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.DamascusSteel), 3, 12, 1); - ChestGenHooks.addItem(BuiltInLootTables.ABANDONED_MINESHAFT, - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.DamascusSteel), 1, 4, 1); - - ChestGenHooks.addItem(BuiltInLootTables.VILLAGE_WEAPONSMITH, - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Chromium), 1, 4, 6); - ChestGenHooks.addItem(BuiltInLootTables.VILLAGE_WEAPONSMITH, - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Neodymium), 2, 8, 6); - ChestGenHooks.addItem(BuiltInLootTables.VILLAGE_WEAPONSMITH, - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Manganese), 2, 8, 12); - ChestGenHooks.addItem(BuiltInLootTables.VILLAGE_WEAPONSMITH, - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel), 4, 12, 12); - ChestGenHooks.addItem(BuiltInLootTables.VILLAGE_WEAPONSMITH, - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Bronze), 4, 12, 12); - ChestGenHooks.addItem(BuiltInLootTables.VILLAGE_WEAPONSMITH, - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Brass), 4, 12, 12); - ChestGenHooks.addItem(BuiltInLootTables.VILLAGE_WEAPONSMITH, - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.DamascusSteel), 4, 12, 1); - - ChestGenHooks.addItem(BuiltInLootTables.STRONGHOLD_CROSSING, - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.DamascusSteel), 4, 8, 6); - ChestGenHooks.addItem(BuiltInLootTables.STRONGHOLD_CROSSING, - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Steel), 8, 16, 12); - ChestGenHooks.addItem(BuiltInLootTables.STRONGHOLD_CROSSING, - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Bronze), 8, 16, 12); - ChestGenHooks.addItem(BuiltInLootTables.STRONGHOLD_CROSSING, - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.Manganese), 4, 8, 12); - ChestGenHooks.addItem(BuiltInLootTables.STRONGHOLD_CROSSING, - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Neodymium), 4, 8, 6); - ChestGenHooks.addItem(BuiltInLootTables.STRONGHOLD_CROSSING, - ChemicalHelper.get(TagPrefix.dust, GTMaterials.Chromium), 2, 4, 6); - - ChestGenHooks.addItem(BuiltInLootTables.STRONGHOLD_CORRIDOR, - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.DamascusSteel), 2, 8, 6); - ChestGenHooks.addItem(BuiltInLootTables.STRONGHOLD_CORRIDOR, - ChemicalHelper.get(TagPrefix.ingot, GTMaterials.DamascusSteel), 3, 12, 6); - } - if (ConfigHolder.INSTANCE.worldgen.increaseDungeonLoot) { - ChestGenHooks.addRolls(BuiltInLootTables.SPAWN_BONUS_CHEST, 2, 4); - ChestGenHooks.addRolls(BuiltInLootTables.SIMPLE_DUNGEON, 1, 3); - ChestGenHooks.addRolls(BuiltInLootTables.DESERT_PYRAMID, 2, 4); - ChestGenHooks.addRolls(BuiltInLootTables.JUNGLE_TEMPLE, 4, 8); - ChestGenHooks.addRolls(BuiltInLootTables.JUNGLE_TEMPLE_DISPENSER, 0, 2); - ChestGenHooks.addRolls(BuiltInLootTables.ABANDONED_MINESHAFT, 1, 3); - ChestGenHooks.addRolls(BuiltInLootTables.VILLAGE_WEAPONSMITH, 2, 6); - ChestGenHooks.addRolls(BuiltInLootTables.STRONGHOLD_CROSSING, 2, 4); - ChestGenHooks.addRolls(BuiltInLootTables.STRONGHOLD_CORRIDOR, 2, 4); - ChestGenHooks.addRolls(BuiltInLootTables.STRONGHOLD_LIBRARY, 4, 8); - } - } -} diff --git a/src/main/java/com/gregtechceu/gtceu/data/loot/GTLootModifications.java b/src/main/java/com/gregtechceu/gtceu/data/loot/GTLootModifications.java new file mode 100644 index 00000000000..ff298e6b04a --- /dev/null +++ b/src/main/java/com/gregtechceu/gtceu/data/loot/GTLootModifications.java @@ -0,0 +1,48 @@ +package com.gregtechceu.gtceu.data.loot; + +import com.gregtechceu.gtceu.GTCEu; + +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraft.resources.ResourceKey; +import net.minecraft.world.level.storage.loot.BuiltInLootTables; +import net.minecraft.world.level.storage.loot.LootTable; +import net.minecraft.world.level.storage.loot.predicates.LootItemCondition; +import net.neoforged.neoforge.common.data.GlobalLootModifierProvider; +import net.neoforged.neoforge.common.loot.AddTableLootModifier; +import net.neoforged.neoforge.common.loot.LootTableIdCondition; + +import org.apache.commons.lang3.ArrayUtils; + +import java.util.concurrent.CompletableFuture; + +import static com.gregtechceu.gtceu.common.loot.condition.GTConfigValueCondition.*; + +public class GTLootModifications extends GlobalLootModifierProvider { + + private static final LootItemCondition[] LOOT_CONFIG_ENABLED_CONDITION = { addLootConfigEnabled().build() }; + + public GTLootModifications(PackOutput output, CompletableFuture registries) { + super(output, registries, GTCEu.MOD_ID); + } + + @Override + protected void start() { + addAddTableModifier(BuiltInLootTables.SPAWN_BONUS_CHEST, GTLootTables.SPAWN_BONUS_CHEST_EXTRA); + addAddTableModifier(BuiltInLootTables.SIMPLE_DUNGEON, GTLootTables.SIMPLE_DUNGEON_EXTRA); + addAddTableModifier(BuiltInLootTables.DESERT_PYRAMID, GTLootTables.DESERT_PYRAMID_EXTRA); + addAddTableModifier(BuiltInLootTables.JUNGLE_TEMPLE, GTLootTables.JUNGLE_TEMPLE_EXTRA); + addAddTableModifier(BuiltInLootTables.JUNGLE_TEMPLE_DISPENSER, GTLootTables.JUNGLE_TEMPLE_DISPENSER_EXTRA); + addAddTableModifier(BuiltInLootTables.ABANDONED_MINESHAFT, GTLootTables.ABANDONED_MINESHAFT_EXTRA); + addAddTableModifier(BuiltInLootTables.VILLAGE_WEAPONSMITH, GTLootTables.VILLAGE_WEAPONSMITH_EXTRA); + addAddTableModifier(BuiltInLootTables.STRONGHOLD_CROSSING, GTLootTables.STRONGHOLD_CROSSING_EXTRA); + addAddTableModifier(BuiltInLootTables.STRONGHOLD_CORRIDOR, GTLootTables.STRONGHOLD_CORRIDOR_EXTRA); + } + + protected void addAddTableModifier(ResourceKey targetLootTableId, + ResourceKey addedLootTableId) { + final LootItemCondition[] conditions = ArrayUtils.add(LOOT_CONFIG_ENABLED_CONDITION, + LootTableIdCondition.builder(targetLootTableId.location()).build()); + add(addedLootTableId.location().getPath(), new AddTableLootModifier(conditions, addedLootTableId)); + } +} diff --git a/src/main/java/com/gregtechceu/gtceu/data/loot/GTLootTables.java b/src/main/java/com/gregtechceu/gtceu/data/loot/GTLootTables.java new file mode 100644 index 00000000000..7450e32f200 --- /dev/null +++ b/src/main/java/com/gregtechceu/gtceu/data/loot/GTLootTables.java @@ -0,0 +1,372 @@ +package com.gregtechceu.gtceu.data.loot; + +import com.gregtechceu.gtceu.GTCEu; +import com.gregtechceu.gtceu.api.data.chemical.ChemicalHelper; +import com.gregtechceu.gtceu.api.data.tag.TagPrefix; +import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTMaterials; + +import net.minecraft.core.HolderLookup; +import net.minecraft.core.registries.Registries; +import net.minecraft.data.PackOutput; +import net.minecraft.data.loot.LootTableProvider; +import net.minecraft.data.loot.LootTableSubProvider; +import net.minecraft.resources.ResourceKey; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.storage.loot.LootPool; +import net.minecraft.world.level.storage.loot.LootTable; +import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; + +import java.util.List; +import java.util.Set; +import java.util.concurrent.CompletableFuture; +import java.util.function.BiConsumer; + +import static com.gregtechceu.gtceu.common.loot.condition.GTConfigValueCondition.*; +import static com.gregtechceu.gtceu.common.loot.function.SetEUChargeFunction.setCharge; +import static com.gregtechceu.gtceu.data.loot.NumberProviderShortcuts.*; +import static net.minecraft.world.level.storage.loot.LootPool.lootPool; +import static net.minecraft.world.level.storage.loot.LootTable.lootTable; +import static net.minecraft.world.level.storage.loot.entries.LootItem.lootTableItem; +import static net.minecraft.world.level.storage.loot.functions.SetItemCountFunction.*; +import static net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceCondition.*; +import static net.minecraft.world.level.storage.loot.providers.number.BinomialDistributionGenerator.*; +import static net.minecraft.world.level.storage.loot.providers.number.ConstantValue.*; +import static net.minecraft.world.level.storage.loot.providers.number.UniformGenerator.*; + +// spotless:off +public class GTLootTables extends LootTableProvider { + + public static final ResourceKey SPAWN_BONUS_CHEST_EXTRA = create("chests/extra/spawn_bonus_chest"); + public static final ResourceKey SIMPLE_DUNGEON_EXTRA = create("chests/extra/simple_dungeon"); + public static final ResourceKey DESERT_PYRAMID_EXTRA = create("chests/extra/desert_pyramid"); + public static final ResourceKey JUNGLE_TEMPLE_EXTRA = create("chests/extra/jungle_temple"); + public static final ResourceKey JUNGLE_TEMPLE_DISPENSER_EXTRA = create("chests/extra/jungle_temple_dispenser"); + public static final ResourceKey ABANDONED_MINESHAFT_EXTRA = create("chests/extra/abandoned_mineshaft"); + public static final ResourceKey VILLAGE_WEAPONSMITH_EXTRA = create("chests/extra/village_weaponsmith"); + public static final ResourceKey STRONGHOLD_CROSSING_EXTRA = create("chests/extra/stronghold_crossing"); + public static final ResourceKey STRONGHOLD_CORRIDOR_EXTRA = create("chests/extra/stronghold_corridor"); + + public GTLootTables(PackOutput output, CompletableFuture registries) { + super(output, Set.of(), List.of( + new SubProviderEntry(ChestLoot::new, LootContextParamSets.CHEST) + ), registries); + } + + private static ResourceKey create(String name) { + return ResourceKey.create(Registries.LOOT_TABLE, GTCEu.id(name)); + } + + /** + *

ALL FORMATTING IS INTENTIONAL! DO NOT CHANGE IT!!

+ * @author screret + */ + public record ChestLoot(HolderLookup.Provider registries) implements LootTableSubProvider { + + // Additional chest loot tables to inject. Note that all roll amounts are lower than in 1.12 because these + // aren't added into the loot tables' existing pools (they're new pools). + // That means we must take some care to avoid overfilling loot chests. + @Override + public void generate(BiConsumer, LootTable.Builder> provider) { + // Negative roll values are skipped, so most rolls' minimums are weighed toward 0. That's intentional and + // is done to limit the amount of items added to chests. + + provider.accept(SPAWN_BONUS_CHEST_EXTRA, lootTable() + .withPool(spawnBonusChestLoot().setRolls(between(0, 1))) + .withPool(spawnBonusChestLoot().setRolls(between(1, 2)) + .when(increaseDungeonLootConfigEnabled()) + ) + ); + + provider.accept(SIMPLE_DUNGEON_EXTRA, lootTable() + // purple drink/sus record loot pool + // usually gives nothing, sometimes purple drink and very rarely the sus record + .withPool(lootPool() + .setRolls(between(-2, 1)) + .add(lootTableItem(GTItems.BOTTLE_PURPLE_DRINK) + .setWeight(15) + .apply(setCount(between(4, 8)))) + .add(lootTableItem(GTItems.SUS_RECORD) + .setWeight(1)) // this should appear in 1/64 dungeon chests on average + ) + // basic loot pool + .withPool(simpleDungeonLoot().setRolls(between(-1, 2))) + // same loot pool again but with the extra rolls condition this time + .withPool(simpleDungeonLoot().setRolls(between(-1, 2)) + .when(increaseDungeonLootConfigEnabled()) + ) + ); + + provider.accept(DESERT_PYRAMID_EXTRA, lootTable() + .withPool(desertPyramidLoot().setRolls(between(-1, 3))) + .withPool(desertPyramidLoot().setRolls(between(-1, 3)) + .when(increaseDungeonLootConfigEnabled()) + ) + ); + + provider.accept(JUNGLE_TEMPLE_EXTRA, lootTable() + .withPool(lootPool() + .setRolls(exactly(1)) + .add(lootTableItem(GTItems.ZERO_POINT_MODULE).apply(setCharge(Long.MAX_VALUE))) + .when(randomChance(0.01f)) + ) + .withPool(jungleTempleLoot().setRolls(between(-1, 4))) + .withPool(jungleTempleLoot().setRolls(between(-1, 4)) + .when(increaseDungeonLootConfigEnabled()) + ) + ); + + provider.accept(JUNGLE_TEMPLE_DISPENSER_EXTRA, lootTable() + .withPool(lootPool() + .setRolls(between(0, 1)) + .add(lootTableItem(Items.FIRE_CHARGE) + .apply(setCount(between(2, 8))) + ) + ) + ); + + provider.accept(ABANDONED_MINESHAFT_EXTRA, lootTable() + .withPool(abandonedMineshaftLoot().setRolls(between(-1, 2))) + .withPool(abandonedMineshaftLoot().setRolls(between(-1, 2)) + .when(increaseDungeonLootConfigEnabled()) + ) + ); + + provider.accept(VILLAGE_WEAPONSMITH_EXTRA, lootTable() + .withPool(villageWeaponsmithLoot().setRolls(between(-1, 4))) + .withPool(villageWeaponsmithLoot().setRolls(between(-1, 4)) + .when(increaseDungeonLootConfigEnabled()) + ) + ); + + provider.accept(STRONGHOLD_CROSSING_EXTRA, lootTable() + .withPool(strongholdCrossingLoot().setRolls(between(-1, 3))) + .withPool(strongholdCrossingLoot().setRolls(between(-1, 3)) + .when(increaseDungeonLootConfigEnabled()) + ) + ); + + provider.accept(STRONGHOLD_CORRIDOR_EXTRA, lootTable() + .withPool(strongholdCorridorLoot().setRolls(between(-2, 2))) + .withPool(strongholdCorridorLoot().setRolls(between(-2, 2)) + .when(increaseDungeonLootConfigEnabled()) + ) + ); + } + + private static LootPool.Builder spawnBonusChestLoot() { + return lootPool() + .add(lootTableItem(GTItems.BOTTLE_PURPLE_DRINK) + .apply(setCount(between(8, 16)))); + } + + private static LootPool.Builder simpleDungeonLoot() { + return lootPool() + .add(lootTableItem(GTItems.BOTTLE_PURPLE_DRINK) + .setWeight(8) + .apply(setCount(between(4, 8)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.ingot, GTMaterials.Silver)) + .setWeight(12) + .apply(setCount(between(1, 6)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.ingot, GTMaterials.Lead)) + .setWeight(3) + .apply(setCount(between(1, 6)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.ingot, GTMaterials.Steel)) + .setWeight(6) + .apply(setCount(between(1, 6)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.ingot, GTMaterials.Bronze)) + .setWeight(6) + .apply(setCount(between(1, 6)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.ingot, GTMaterials.Manganese)) + .setWeight(6) + .apply(setCount(between(1, 6)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.ingot, GTMaterials.DamascusSteel)) + .setWeight(1) + .apply(setCount(between(1, 6)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.gem, GTMaterials.Emerald)) + .setWeight(2) + .apply(setCount(between(1, 6)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.gem, GTMaterials.Ruby)) + .setWeight(2) + .apply(setCount(between(1, 6)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.gem, GTMaterials.Sapphire)) + .setWeight(2) + .apply(setCount(between(1, 6)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.gem, GTMaterials.GreenSapphire)) + .setWeight(2) + .apply(setCount(between(1, 6)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.gem, GTMaterials.Olivine)) + .setWeight(2) + .apply(setCount(between(1, 6)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.gem, GTMaterials.GarnetRed)) + .setWeight(2) + .apply(setCount(between(1, 6)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.gem, GTMaterials.GarnetYellow)) + .setWeight(2) + .apply(setCount(between(1, 6)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.dust, GTMaterials.Neodymium)) + .setWeight(4) + .apply(setCount(between(1, 6)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.dust, GTMaterials.Chromium)) + .setWeight(4) + .apply(setCount(between(1, 6)))); + } + + private static LootPool.Builder desertPyramidLoot() { + return lootPool() + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.ingot, GTMaterials.Silver)) + .setWeight(12) + .apply(setCount(between(4, 16)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.ingot, GTMaterials.Platinum)) + .setWeight(4) + .apply(setCount(between(2, 8)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.gem, GTMaterials.Ruby)) + .setWeight(2) + .apply(setCount(between(2, 8)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.gem, GTMaterials.Sapphire)) + .setWeight(2) + .apply(setCount(between(2, 8)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.gem, GTMaterials.GreenSapphire)) + .setWeight(2) + .apply(setCount(between(2, 8)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.gem, GTMaterials.Olivine)) + .setWeight(2) + .apply(setCount(between(2, 8)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.gem, GTMaterials.GarnetRed)) + .setWeight(4) + .apply(setCount(between(2, 8)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.gem, GTMaterials.GarnetYellow)) + .setWeight(4) + .apply(setCount(between(2, 8)))); + } + + private static LootPool.Builder jungleTempleLoot() { + return lootPool() + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.ingot, GTMaterials.Bronze)) + .setWeight(12) + .apply(setCount(between(4, 16)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.gem, GTMaterials.Ruby)) + .setWeight(2) + .apply(setCount(between(2, 8)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.gem, GTMaterials.Sapphire)) + .setWeight(2) + .apply(setCount(between(2, 8)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.gem, GTMaterials.GreenSapphire)) + .setWeight(2) + .apply(setCount(between(2, 8)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.gem, GTMaterials.Olivine)) + .setWeight(2) + .apply(setCount(between(2, 8)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.gem, GTMaterials.GarnetRed)) + .setWeight(4) + .apply(setCount(between(2, 8)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.gem, GTMaterials.GarnetYellow)) + .setWeight(4) + .apply(setCount(between(2, 8)))); + } + + private static LootPool.Builder abandonedMineshaftLoot() { + return lootPool() + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.ingot, GTMaterials.Silver)) + .setWeight(12) + .apply(setCount(between(1, 4)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.ingot, GTMaterials.Lead)) + .setWeight(3) + .apply(setCount(between(1, 4)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.ingot, GTMaterials.Steel)) + .setWeight(6) + .apply(setCount(between(1, 4)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.ingot, GTMaterials.Bronze)) + .setWeight(6) + .apply(setCount(between(1, 4)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.ingot, GTMaterials.Manganese)) + .setWeight(6) + .apply(setCount(between(1, 4)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.gem, GTMaterials.Sapphire)) + .setWeight(2) + .apply(setCount(between(1, 4)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.gem, GTMaterials.GreenSapphire)) + .setWeight(2) + .apply(setCount(between(1, 4)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.gem, GTMaterials.Olivine)) + .setWeight(2) + .apply(setCount(between(1, 4)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.gem, GTMaterials.GarnetRed)) + .setWeight(2) + .apply(setCount(between(1, 4)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.gem, GTMaterials.GarnetYellow)) + .setWeight(2) + .apply(setCount(between(1, 4)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.gem, GTMaterials.Ruby)) + .setWeight(2) + .apply(setCount(between(1, 4)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.gem, GTMaterials.Emerald)) + .setWeight(2) + .apply(setCount(between(1, 4)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.ingot, GTMaterials.DamascusSteel)) + .setWeight(1) + .apply(setCount(between(3, 12)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.ingot, GTMaterials.DamascusSteel)) + .setWeight(1) + .apply(setCount(between(1, 4)))); + } + + private static LootPool.Builder villageWeaponsmithLoot() { + return lootPool() + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.dust, GTMaterials.Chromium)) + .setWeight(6) + .apply(setCount(between(1, 4)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.dust, GTMaterials.Neodymium)) + .setWeight(6) + .apply(setCount(between(2, 8)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.ingot, GTMaterials.Manganese)) + .setWeight(12) + .apply(setCount(between(2, 8)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.ingot, GTMaterials.Steel)) + .setWeight(12) + .apply(setCount(between(4, 12)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.ingot, GTMaterials.Bronze)) + .setWeight(12) + .apply(setCount(between(4, 12)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.ingot, GTMaterials.Brass)) + .setWeight(12) + .apply(setCount(between(4, 12)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.ingot, GTMaterials.DamascusSteel)) + .setWeight(1) + .apply(setCount(between(4, 12)))); + } + + private static LootPool.Builder strongholdCrossingLoot() { + return lootPool() + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.ingot, GTMaterials.DamascusSteel)) + .setWeight(6) + .apply(setCount(between(4, 8)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.ingot, GTMaterials.Steel)) + .setWeight(12) + .apply(setCount(between(8, 16)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.ingot, GTMaterials.Bronze)) + .setWeight(12) + .apply(setCount(between(8, 16)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.ingot, GTMaterials.Manganese)) + .setWeight(12) + .apply(setCount(between(4, 8)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.dust, GTMaterials.Neodymium)) + .setWeight(6) + .apply(setCount(between(4, 8)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.dust, GTMaterials.Chromium)) + .setWeight(6) + .apply(setCount(between(2, 4)))); + } + + private static LootPool.Builder strongholdCorridorLoot() { + return lootPool() + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.ingot, GTMaterials.DamascusSteel)) + .setWeight(1) + .apply(setCount(between(2, 8)))) + .add(lootTableItem(ChemicalHelper.getItem(TagPrefix.ingot, GTMaterials.DamascusSteel)) + .setWeight(1) + .apply(setCount(between(3, 12)))); + } + } +} +// spotless:on diff --git a/src/main/java/com/gregtechceu/gtceu/data/loot/NumberProviderShortcuts.java b/src/main/java/com/gregtechceu/gtceu/data/loot/NumberProviderShortcuts.java new file mode 100644 index 00000000000..b3b02a0cb68 --- /dev/null +++ b/src/main/java/com/gregtechceu/gtceu/data/loot/NumberProviderShortcuts.java @@ -0,0 +1,63 @@ +package com.gregtechceu.gtceu.data.loot; + +import net.minecraft.world.level.storage.loot.providers.number.*; + +import lombok.experimental.UtilityClass; + +/** + * Utility class for working with loot tables and their number providers. To use this class efficiently, add the + * following static imports to your class: + * + * 
{@code
+ * import static com.gregtechceu.gtceu.data.loot.NumberProviderShortcuts.*;
+ * import static net.minecraft.world.level.storage.loot.LootTable.lootTable;
+ * import static net.minecraft.world.level.storage.loot.LootPool.lootPool;
+ * import static net.minecraft.world.level.storage.loot.entries.LootItem.lootTableItem;
+ * import static net.minecraft.world.level.storage.loot.functions.SetItemCountFunction.*;
+ * import static net.minecraft.world.level.storage.loot.predicates.LootItemRandomChanceCondition.*;
+ * import static net.minecraft.world.level.storage.loot.providers.number.ConstantValue.*;
+ * import static net.minecraft.world.level.storage.loot.providers.number.UniformGenerator.*;
+ * import static net.minecraft.world.level.storage.loot.providers.number.BinomialDistributionGenerator.*;
+ * }
+ */ +@UtilityClass +public class NumberProviderShortcuts { + + // region CONSTANT VALUE + + public static ConstantValue constant(float value) { + return ConstantValue.exactly(value); + } + + // endregion // + // region UNIFORM GENERATOR + + public static UniformGenerator between(NumberProvider min, NumberProvider max) { + return new UniformGenerator(min, max); + } + + public static UniformGenerator between(float min, NumberProvider max) { + return between(constant(min), max); + } + + public static UniformGenerator between(NumberProvider min, float max) { + return between(min, constant(max)); + } + + // endregion // + // region BINOMIAL DISTRIBUTION GENERATOR + + public static BinomialDistributionGenerator binomial(NumberProvider n, NumberProvider p) { + return new BinomialDistributionGenerator(n, p); + } + + public static BinomialDistributionGenerator binomial(int n, NumberProvider p) { + return binomial(constant(n), p); + } + + public static BinomialDistributionGenerator binomial(NumberProvider n, float p) { + return binomial(n, constant(p)); + } + + // endregion // +} diff --git a/src/main/java/com/gregtechceu/gtceu/data/loot/package-info.java b/src/main/java/com/gregtechceu/gtceu/data/loot/package-info.java new file mode 100644 index 00000000000..96e337c59d5 --- /dev/null +++ b/src/main/java/com/gregtechceu/gtceu/data/loot/package-info.java @@ -0,0 +1,4 @@ +@NotNullByDefault +package com.gregtechceu.gtceu.data.loot; + +import org.jetbrains.annotations.NotNullByDefault; diff --git a/src/main/resources/assets/gtceu/lang/de_de.json b/src/main/resources/assets/gtceu/lang/de_de.json index a6bbeed5263..765ef550b84 100644 --- a/src/main/resources/assets/gtceu/lang/de_de.json +++ b/src/main/resources/assets/gtceu/lang/de_de.json @@ -14,7 +14,6 @@ "behavior.portable_scanner.debug_lag_count": "%s Lag-Spikes erkannt (> %sms)", "behavior.portable_scanner.debug_machine": "Meta-ID: %s", "behavior.portable_scanner.debug_machine_invalid": "Ungültig!", - "behavior.portable_scanner.debug_machine_invalid_null=invalid! MetaTileEntity =": "Null!", "behavior.portable_scanner.debug_machine_valid": "Gültig", "behavior.portable_scanner.divider": "=========================", "behavior.portable_scanner.energy_container_in": "Max IN: %s EU (%s) @ %s A", @@ -813,7 +812,7 @@ "block.gtceu.me_pattern_buffer_proxy": "ME Pattern Buffer Proxy", "block.gtceu.me_stocking_input_bus": "ME-Strumpf-Eingangsbus", "block.gtceu.me_stocking_input_hatch": "ME-Strumpf-Eingabeklappe", - "block.gtceu.mega_blast_furnace": "Drehherdofen", + "block.gtceu.rotary_hearth_furnace": "Drehherdofen", "block.gtceu.mega_vacuum_freezer": "Massenschockkühler", "block.gtceu.miner_pipe": "Bergmannsrohr", "block.gtceu.mob_infestation_hazard_sign_block": "Mob-Befall-Gefahrenschild-Block", @@ -1005,7 +1004,7 @@ "block.gtceu.orange_metal_sheet": "Orangefarbenes Metallblech", "block.gtceu.orange_studs": "Oranger Nietenblock", "block.gtceu.overworld_marker": "Oberwelt", - "block.gtceu.palladium_substation": "Palladium-Umspannwerksgehäuse", + "block.gtceu.palladium_substation_casing": "Palladium-Umspannwerksgehäuse", "block.gtceu.pattern_buffer.desc.0": "§fErmöglicht die direkte §6AE2-Musterspeicherung §ffür GregTech Multiblocks.", "block.gtceu.pattern_buffer.desc.1": "§fAE2-Muster können alles verwenden, was im §6gemeinsamen Inventar §fWidget gespeichert ist.", "block.gtceu.pattern_buffer.desc.2": "§fVerknüpfe §6Pattern Buffer Proxys §fmit einem §bDatenstick §f, um Maschinen miteinander zu verknüpfen!", @@ -1717,7 +1716,7 @@ "block.gtceu.zpm_transformer_4a": "§cZPM-Spannung§r Hi-Amp (4x) Transformator", "block.gtceu.zpm_wiremill": "§bZPM Drahtwerk", "block.gtceu.zpm_world_accelerator": "§cElite World Accelerator III§r", - "block.sterilizing_filter_casing.tooltip": "Erstellt eine §asterilisierte§7 Umgebung", + "block.gtceu.sterilizing_filter_casing.tooltip": "Erstellt eine §asterilisierte§7 Umgebung", "block.gtceu.surface_rock": "%s Oberflächengestein", "button.gtceu.mark_as_depleted.name": "Als erschöpft markieren", "button.gtceu.toggle_waypoint.name": "Wegpunkt umschalten", @@ -1810,7 +1809,7 @@ "config.gtceu.option.generateLowQualityGems": "generierenLowQualityGems", "config.gtceu.option.ghostCircuit": "ghostSchaltkreis", "config.gtceu.option.gt6StylePipesCables": "gt6StylePipesCables", - "config.gtceu.option.hardErweitertIronRecipes": "hardErweitertIronRecipes", + "config.gtceu.option.hardAdvancedIronRecipes": "hardErweitertIronRecipes", "config.gtceu.option.hardDyeRecipes": "hardDyeRecipes", "config.gtceu.option.hardGlassRecipes": "hardGlassRecipes", "config.gtceu.option.hardIronRecipes": "hardIronRecipes", @@ -2096,7 +2095,6 @@ "cover.pump.mode.import": "Modus: Importieren", "cover.pump.title": "Pumpenabdeckungseinstellungen (%s)", "cover.pump.transfer_rate": "%s", - "cover.robotic_arm.title": "Roboterarmeinstellungen (%s)", "cover.robotic_arm.transfer_mode.description.0": "§eAlle übertragen§r – In diesem Modus überträgt das Cover so viele Item, die seinem Filter entsprechen, wie möglich.", "cover.robotic_arm.transfer_mode.description.1": "§eGenau liefern§r – in diesem Modus liefert die Abdeckung Item in Portionen, die in Itemfilter-Slots (oder einer Variablen unter dieser Schaltfläche für Tag-Filter) angegeben sind. Wenn die Anzahl der Item geringer ist als die Portionsgröße, werden die Item nicht verschoben.", "cover.robotic_arm.transfer_mode.description.2": "§eGenau halten§r – In diesem Modus behält die Abdeckung die angegebene Menge an Itemsn im Zielinventar und stellt bei Bedarf zusätzliche Mengen an Itemsn bereit.", @@ -2193,8 +2191,6 @@ "enchantment.gtceu.disjunction.description": "Verleiht Ender-bezogenen Mobs Schwäche und Langsamkeit.", "enchantment.gtceu.hard_hammer.description": "Zerbricht Blöcke, als wären sie mit einem GregTech-Hammer abgebaut worden.", "enchantment.hard_hammer": "Hämmern", - "entity.gtceu.boat": "Boot", - "entity.gtceu.chest_boat": "Brustboot", "entity.gtceu.dynamite": "Dynamit", "entity.gtceu.industrial_tnt": "Industrielles TNT", "entity.gtceu.powderbarrel": "Pulverfass", @@ -2204,19 +2200,19 @@ "fluid.tile.lava": "Lava", "fluid.tile.water": "Wasser", "fluid_cell.empty": "Leer", - "gtceu.air_scrubber": "Luftreiniger", - "gtceu.alloy_blast_smelter": "Legierungs-Hochschmelzofen", - "gtceu.alloy_smelter": "Legierungsschmelzofen", - "gtceu.arc_furnace": "Lichtbogenofen", - "gtceu.assembler": "Monteur", - "gtceu.assembly_line": "Fließband", + "recipe_type.gtceu.air_scrubber": "Luftreiniger", + "recipe_type.gtceu.alloy_blast_smelter": "Legierungs-Hochschmelzofen", + "recipe_type.gtceu.alloy_smelter": "Legierungsschmelzofen", + "recipe_type.gtceu.arc_furnace": "Lichtbogenofen", + "recipe_type.gtceu.assembler": "Monteur", + "recipe_type.gtceu.assembly_line": "Fließband", "gtceu.auto_decomp.rotor": "Turbinenrotor", "gtceu.auto_decomp.tool": "Nicht elektrisches Werkzeug", - "gtceu.autoclave": "Autoklav", + "recipe_type.gtceu.autoclave": "Autoklav", "gtceu.battery_buffer.average_input": "Durchschnittlicher Input: %s EU/t", "gtceu.battery_buffer.average_output": "Durchschnittliche Produktion: %s EU/t", - "gtceu.bender": "Biegemaschine", - "gtceu.brewery": "Brauerei", + "recipe_type.gtceu.bender": "Biegemaschine", + "recipe_type.gtceu.brewery": "Brauerei", "gtceu.bus.collapse.error": "Der Bus muss zuerst an den Multiblock angeschlossen werden", "gtceu.bus.collapse_false": "Der Bus lässt die Items nicht einklappen", "gtceu.bus.collapse_true": "Der Bus wird Items einklappen", @@ -2228,7 +2224,7 @@ "gtceu.cable.loss_per_block": "§cVerlust/Meter/Ampere:§r §c%d§7 EU-Volt", "gtceu.cable.superconductor": "%s §dSupraleiter", "gtceu.cable.voltage": "§aMax. Spannung:§r §a%d §a(%s§a)", - "gtceu.canner": "Einkocher", + "recipe_type.gtceu.canner": "Einkocher", "gtceu.central_monitor.gui.create_group": "Gruppe erstellen", "gtceu.central_monitor.gui.currently_editing": "Derzeit bearbeitet: %s", "gtceu.central_monitor.gui.remove_from_group": "Aus der Gruppe entfernen", @@ -2243,19 +2239,19 @@ "gtceu.central_monitor.info_tooltip.7": "Setze die Abdeckung auf den Zielblock, klicke mit einem Datenstick mit der rechten Maustaste darauf und stecke diesen Datenstick in eine Datenzugriffsklappe im Multiblock.", "gtceu.central_monitor.info_tooltip.8": "Wähle dann als Ziel die Datenzugriffsklappe aus und stelle im erscheinenden Zahlenfeld den Steckplatzindex Ihres Datensticks ein.", "gtceu.central_monitor.size": "Größe: (%d+1+%d)x(%d+1+%d)", - "gtceu.centrifuge": "Zentrifuge", + "recipe_type.gtceu.centrifuge": "Zentrifuge", "gtceu.chance_logic.and": "UND", "gtceu.chance_logic.first": "ERSTE", "gtceu.chance_logic.none": "KEINER", "gtceu.chance_logic.or": "ODER", "gtceu.chance_logic.xor": "XOR", "gtceu.chat.cape": "§5Herzlichen Glückwunsch: Du hast gerade ein neues Cape freigeschaltet! Informationen zur Verwendung findest du in der Cape Selector-Terminal-App.§r", - "gtceu.chemical_bath": "Chemikalienbad", - "gtceu.chemical_reactor": "Chemischer Reaktor", - "gtceu.circuit_assembler": "Schaltungsmonteur", - "gtceu.coke_oven": "Koksofen", - "gtceu.combustion_generator": "Verbrennungsgenerator", - "gtceu.compressor": "Kompressor", + "recipe_type.gtceu.chemical_bath": "Chemikalienbad", + "recipe_type.gtceu.chemical_reactor": "Chemischer Reaktor", + "recipe_type.gtceu.circuit_assembler": "Schaltungsmonteur", + "recipe_type.gtceu.coke_oven": "Koksofen", + "recipe_type.gtceu.combustion_generator": "Verbrennungsgenerator", + "recipe_type.gtceu.compressor": "Kompressor", "gtceu.computer_monitor_cover.error.bf_invalid": "Ungültiges Zeichen bei %d", "gtceu.computer_monitor_cover.error.bf_invalid_num": "Ungültige Nummer am Index %d bei der Verarbeitung der Symbolnummer %d", "gtceu.computer_monitor_cover.error.exception": "Es ist eine unerwartete Ausnahme aufgetreten: %s", @@ -2281,7 +2277,7 @@ "gtceu.cover.fluid_detector.message_fluid_storage_normal": "Überwachung der normalen Flüssigkeitsspeicherung", "gtceu.cover.item_detector.message_item_storage_inverted": "Überwachung der Lagerung umgekehrter Item", "gtceu.cover.item_detector.message_item_storage_normal": "Überwachung der normalen Itemlagerung", - "gtceu.cracker": "Cracker", + "recipe_type.gtceu.cracker": "Cracker", "gtceu.creative.activity.off": "Nicht aktiv", "gtceu.creative.activity.on": "Aktiv", "gtceu.creative.chest.ipc": "Item pro Zyklus", @@ -2298,7 +2294,7 @@ "gtceu.creative_tooltip.1": "§7Sie brauchen nur", "gtceu.creative_tooltip.2": "Kreativmodus", "gtceu.creative_tooltip.3": "§7, um dies zu verwenden", - "gtceu.cutter": "Schneider", + "recipe_type.gtceu.cutter": "Schneider", "gtceu.debug.f3_h.enabled": "GregTech hat die Debug-Informationen geändert! Für Entwickler: Aktiviere die Konfigurationsoption misc:debug in der GregTech-Konfigurationsdatei, um mehr zu sehen", "gtceu.debug.resource_rebuild.done": "Wiederherstellung der Gradle-Ressource durchgeführt in %s", "gtceu.debug.resource_rebuild.start": "Aufrufen der Wiederherstellung der Gradle-Ressource (./gradlew:processResources)", @@ -2310,22 +2306,22 @@ "gtceu.direction.tooltip.up": "Hoch", "gtceu.display_source.computer_monitor_cover": "Computermonitorabdeckung", "gtceu.display_target.computer_monitor_cover": "Computermonitorabdeckung", - "gtceu.distillation_tower": "Destillationsturm", - "gtceu.distillery": "Destillationsanlage", + "recipe_type.gtceu.distillation_tower": "Destillationsturm", + "recipe_type.gtceu.distillery": "Destillationsanlage", "gtceu.duct_pipe.transfer_rate": "§bLuftübertragungsrate: %s", - "gtceu.dummy": "Dummy", - "gtceu.electric_blast_furnace": "Elektrischer Hochofen", - "gtceu.electric_furnace": "Elektroofen", - "gtceu.electrolyzer": "Elektrolyseanlage", - "gtceu.electromagnetic_separator": "Elektromagnetischer Separator", + "recipe_type.gtceu.dummy": "Dummy", + "recipe_type.gtceu.electric_blast_furnace": "Elektrischer Hochofen", + "recipe_type.gtceu.electric_furnace": "Elektroofen", + "recipe_type.gtceu.electrolyzer": "Elektrolyseanlage", + "recipe_type.gtceu.electromagnetic_separator": "Elektromagnetischer Separator", "gtceu.ender_item_link_cover.title": "Ender-Item-Link", "gtceu.ender_item_link_cover.tooltip": "§7Transportiert §fItems§7 mit einer §fdrahtlosen §dEnder§f-Verbindung§7 als §fAbdeckung§7.", "gtceu.ender_redstone_link_cover.label": "Redstone-Leistung: %d", "gtceu.ender_redstone_link_cover.title": "Ender-Redstone-Link", "gtceu.ender_redstone_link_cover.tooltip": "§7Überträgt §fRedstone-Signale§7 mit einer §fdrahtlosen §dEnder-§f-Verbindung§7 als §fAbdeckung§7.", - "gtceu.extractor": "Extraktor", - "gtceu.extruder": "Extruder", - "gtceu.fermenter": "Fermentierer", + "recipe_type.gtceu.extractor": "Extraktor", + "recipe_type.gtceu.extruder": "Extruder", + "recipe_type.gtceu.fermenter": "Fermentierer", "gtceu.fluid.amount": "§9Menge: %d/%d mB", "gtceu.fluid.click_combined": "§7Klicke mit einem Flüssigkeitsbehälter, um den Tank zu §cleeren §7 oder §bzu füllen §7 (Shift-Klick für einen vollen Stapel).", "gtceu.fluid.click_to_empty": "§7Klicke mit einem Flüssigkeitsbehälter, um den Tank zu §cleeren §7(Shift-Klick für einen vollen Stapel).", @@ -2343,7 +2339,7 @@ "gtceu.fluid.temperature": "§cTemperatur: %s", "gtceu.fluid.temperature.cryogenic": "§bKryogen! Vorsichtig behandeln!", "gtceu.fluid.type_acid.tooltip": "§6Sauer! Vorsichtig behandeln!", - "gtceu.fluid_heater": "Flüssigkeitserhitzer", + "recipe_type.gtceu.fluid_heater": "Flüssigkeitserhitzer", "gtceu.fluid_pipe.acid_proof": "§6Kann mit Säuren umgehen", "gtceu.fluid_pipe.capacity": "§9Kapazität: §f%d mB", "gtceu.fluid_pipe.channels": "§eKanäle: §f%d", @@ -2352,15 +2348,15 @@ "gtceu.fluid_pipe.max_temperature": "§cTemperaturgrenze: §f%s", "gtceu.fluid_pipe.not_gas_proof": "§4Es können Gase austreten!", "gtceu.fluid_pipe.plasma_proof": "§6Kann mit allen Plasmen umgehen", - "gtceu.fluid_solidifier": "Flüssigkeitsverfestiger", - "gtceu.forge_hammer": "Schmiedehammer", - "gtceu.forming_press": "Formpresse", + "recipe_type.gtceu.fluid_solidifier": "Flüssigkeitsverfestiger", + "recipe_type.gtceu.forge_hammer": "Schmiedehammer", + "recipe_type.gtceu.forming_press": "Formpresse", "gtceu.forming_press.naming.named": "§oBenanntes Element", "gtceu.forming_press.naming.press": "§oBenannte Presse", "gtceu.forming_press.naming.to_name": "§oElement zum Benennen", - "gtceu.fusion_reactor": "Fusionsreaktor", - "gtceu.gas_collector": "Gassammler", - "gtceu.gas_turbine": "Gasturbine", + "recipe_type.gtceu.fusion_reactor": "Fusionsreaktor", + "recipe_type.gtceu.gas_collector": "Gassammler", + "recipe_type.gtceu.gas_turbine": "Gasturbine", "gtceu.gui.adv_stocking_config.min_fluid_count": "Mindestgröße des Flüssigkeitsstapels für automatisiertes Ziehen", "gtceu.gui.adv_stocking_config.min_item_count": "Mindestgröße des Itemstapels für automatisches Ziehen", "gtceu.gui.adv_stocking_config.ticks_per_cycle": "Verzögerung zwischen Aktualisierungen der Itemliste", @@ -2499,7 +2495,7 @@ "gtceu.gui.toggle_view.disabled": "Ansicht umschalten (Flüssigkeiten)", "gtceu.gui.toggle_view.enabled": "Ansicht umschalten (Item)", "gtceu.gui.waiting_list": "Sendewarteschlange:", - "gtceu.implosion_compressor": "Implosionskompressor", + "recipe_type.gtceu.implosion_compressor": "Implosionskompressor", "gtceu.io.both": "Beide", "gtceu.io.export": "Export", "gtceu.io.import": "Import", @@ -2510,7 +2506,7 @@ "gtceu.item_pipe.priority": "§9Priorität: §f%d", "gtceu.jade.amperage_use": "%s A", "gtceu.jade.at": "@", - "gtceu.jade.changes_eu_sec": "%s EU/s", + "gtceu.jade.changes_eu_tick": "%s EU/t", "gtceu.jade.cleaned_this_second": "Gereinigte Gefahr: %s/s", "gtceu.jade.days": "%s Tage", "gtceu.jade.energy_stored": "%d / %d EU", @@ -2524,14 +2520,14 @@ "gtceu.jade.remaining_discharge_time": "Bis leer: %s", "gtceu.jade.seconds": "%s Sekunden", "gtceu.jade.years": "%s Jahre", - "gtceu.jei.bedrock_fluid.heavy_oil_deposit": "Schweröllagerstätte", - "gtceu.jei.bedrock_fluid.lava_deposit": "Lava-Lagerstätte", - "gtceu.jei.bedrock_fluid.light_oil_deposit": "Leichtöllagerstätte", - "gtceu.jei.bedrock_fluid.natural_gas_deposit": "Erdgasvorkommen", - "gtceu.jei.bedrock_fluid.nether_natural_gas_deposit": "Nether-Erdgaslagerstätte", - "gtceu.jei.bedrock_fluid.oil_deposit": "Öllagerstätte", - "gtceu.jei.bedrock_fluid.raw_oil_deposit": "Rohöllagerstätte", - "gtceu.jei.bedrock_fluid.salt_water_deposit": "Salzwasservorkommen", + "bedrock_fluid.gtceu.heavy_oil_deposit": "Schweröllagerstätte", + "bedrock_fluid.gtceu.lava_deposit": "Lava-Lagerstätte", + "bedrock_fluid.gtceu.light_oil_deposit": "Leichtöllagerstätte", + "bedrock_fluid.gtceu.natural_gas_deposit": "Erdgasvorkommen", + "bedrock_fluid.gtceu.nether_natural_gas_deposit": "Nether-Erdgaslagerstätte", + "bedrock_fluid.gtceu.oil_deposit": "Öllagerstätte", + "bedrock_fluid.gtceu.raw_oil_deposit": "Rohöllagerstätte", + "bedrock_fluid.gtceu.salt_water_deposit": "Salzwasservorkommen", "gtceu.jei.bedrock_fluid_diagram": "Grundgesteinsflüssigkeitsdiagramm", "gtceu.jei.bedrock_ore_diagram": "Grundgesteins-Erz-Diagramm", "gtceu.jei.fluid.dep_amount_hover": "Der Betrag, um den die Vene erschöpft wird", @@ -2566,46 +2562,46 @@ "gtceu.jei.ore.surface_rock.0": "Oberflächengesteine ​​mit diesem Material kennzeichnen die Entstehungsorte von Adern.", "gtceu.jei.ore.surface_rock.1": "Sie können für 3 winzige Pulverhaufen zerbrochen werden, wobei Fortune einen Bonus gewährt.", "gtceu.jei.ore_processing_diagram": "Erzverarbeitungsdiagramm", - "gtceu.jei.ore_vein.apatite_vein": "Apatit-Ader", - "gtceu.jei.ore_vein.banded_iron_vein": "Gebänderte Eisenader", - "gtceu.jei.ore_vein.bauxite_vein_end": "Ende der Bauxit-Ader", - "gtceu.jei.ore_vein.beryllium_vein": "Berylliumader", - "gtceu.jei.ore_vein.cassiterite_vein": "Kassiterit-Ader", - "gtceu.jei.ore_vein.certus_quartz": "Certus-Quarz", - "gtceu.jei.ore_vein.coal_vein": "Kohleader", - "gtceu.jei.ore_vein.copper_tin_vein": "Kupfer-Zinn-Ader", - "gtceu.jei.ore_vein.copper_vein": "Kupferader", - "gtceu.jei.ore_vein.diamond_vein": "Diamantader", - "gtceu.jei.ore_vein.galena_vein": "Galena-Ader", - "gtceu.jei.ore_vein.garnet_tin_vein": "Granat-Zinn-Ader", - "gtceu.jei.ore_vein.garnet_vein": "Granatader", - "gtceu.jei.ore_vein.iron_vein": "Eisenader", - "gtceu.jei.ore_vein.lapis_vein": "Lapis-Ader", - "gtceu.jei.ore_vein.lubricant_vein": "Schmiermittelvene", - "gtceu.jei.ore_vein.magnetite_vein_end": "Ende der Magnetit-Ader", - "gtceu.jei.ore_vein.magnetite_vein_ow": "Magnetitader Ow", - "gtceu.jei.ore_vein.manganese_vein": "Mangan-Ader", - "gtceu.jei.ore_vein.manganese_vein_ow": "Mangan-Ader Ow", - "gtceu.jei.ore_vein.mica_vein": "Glimmerader", - "gtceu.jei.ore_vein.mineral_sand_vein": "Mineralische Sandader", - "gtceu.jei.ore_vein.molybdenum_vein": "Molybdän-Ader", - "gtceu.jei.ore_vein.monazite_vein": "Monazit-Ader", - "gtceu.jei.ore_vein.naquadah_vein": "Naquadah-Ader", - "gtceu.jei.ore_vein.nether_quartz_vein": "Netherquarzader", - "gtceu.jei.ore_vein.nickel_vein": "Nickelader", - "gtceu.jei.ore_vein.oilsands_vein": "Ölsandader", - "gtceu.jei.ore_vein.olivine_vein": "Olivinader", - "gtceu.jei.ore_vein.pitchblende_vein_end": "Ende der Pechblende-Ader", - "gtceu.jei.ore_vein.redstone_vein": "Redstone-Ader", - "gtceu.jei.ore_vein.redstone_vein_ow": "Redstone-Ader Ow", - "gtceu.jei.ore_vein.saltpeter_vein": "Salpeterader", - "gtceu.jei.ore_vein.salts_vein": "Salzader", - "gtceu.jei.ore_vein.sapphire_vein": "Saphirader", - "gtceu.jei.ore_vein.scheelite_vein": "Scheelit-Ader", - "gtceu.jei.ore_vein.sheldonite_vein": "Sheldonit-Ader", - "gtceu.jei.ore_vein.sulfur_vein": "Schwefelader", - "gtceu.jei.ore_vein.tetrahedrite_vein": "Tetrahedrit-Ader", - "gtceu.jei.ore_vein.topaz_vein": "Topas-Ader", + "ore_vein.gtceu.apatite": "Apatit", + "ore_vein.gtceu.banded_iron": "Gebänderte Eisen", + "ore_vein.gtceu.end_bauxite": "Ende der Bauxit", + "ore_vein.gtceu.beryllium": "Beryllium", + "ore_vein.gtceu.cassiterite": "Kassiterit", + "ore_vein.gtceu.certus_quartz": "Certus-Quarz", + "ore_vein.gtceu.coal": "Kohle", + "ore_vein.gtceu.copper_tin": "Kupfer-Zinn", + "ore_vein.gtceu.copper": "Kupfer", + "ore_vein.gtceu.diamond": "Diamant", + "ore_vein.gtceu.galena": "Galena", + "ore_vein.gtceu.garnet_tin": "Granat-Zinn", + "ore_vein.gtceu.garnet": "Granat", + "ore_vein.gtceu.iron": "Eisen", + "ore_vein.gtceu.lapis": "Lapis", + "ore_vein.gtceu.lubricant": "Schmiermittelvene", + "ore_vein.gtceu.end_magnetite": "Ende der Magnetit", + "ore_vein.gtceu.magnetite": "Magnetit", + "ore_vein.gtceu.nether_manganese": "Nether Mangan", + "ore_vein.gtceu.manganese": "Mangan", + "ore_vein.gtceu.mica": "Glimmerader", + "ore_vein.gtceu.mineral_sand": "Mineralische Sandader", + "ore_vein.gtceu.molybdenum": "Molybdän", + "ore_vein.gtceu.monazite": "Monazit", + "ore_vein.gtceu.naquadah": "Naquadah", + "ore_vein.gtceu.nether_quartz": "Netherquarzader", + "ore_vein.gtceu.nickel": "Nickelader", + "ore_vein.gtceu.oilsands": "Ölsandader", + "ore_vein.gtceu.olivine": "Olivinader", + "ore_vein.gtceu.pitchblende": "Pechblende", + "ore_vein.gtceu.nether_redstone": "Nether Redstone", + "ore_vein.gtceu.redstone": "Redstone", + "ore_vein.gtceu.saltpeter": "Salpeterader", + "ore_vein.gtceu.salts": "Salzader", + "ore_vein.gtceu.sapphire": "Saphirader", + "ore_vein.gtceu.scheelite": "Scheelit", + "ore_vein.gtceu.sheldonite": "Sheldonit", + "ore_vein.gtceu.sulfur": "Schwefelader", + "ore_vein.gtceu.tetrahedrite": "Tetrahedrit", + "ore_vein.gtceu.topaz": "Topas", "gtceu.jei.ore_vein_diagram": "Erzgangdiagramm", "gtceu.jei.ore_vein_diagram.chance": "§eChance: %s§r", "gtceu.jei.ore_vein_diagram.dimensions": "Abmessungen:", @@ -2613,9 +2609,6 @@ "gtceu.jei.ore_vein_diagram.weight": "Gewicht: %s", "gtceu.jei.programmed_circuit": "Seite „Programmierte Schaltung“.", "gtceu.journeymap.options.layers": "Prospektionsebenen", - "gtceu.journeymap.options.layers.bedrock_fluids": "Zeige flüssige Adern im Grundgestein", - "gtceu.journeymap.options.layers.hide_depleted": "Verstecke erschöpfte Adern", - "gtceu.journeymap.options.layers.ore_veins": "Erzadern anzeigen", "gtceu.key.armor_charging": "Rüstungsaufladung zum Inventar umschalten", "gtceu.key.armor_hover": "Rüstung schweben umschalten", "gtceu.key.armor_mode_switch": "Rüstungsmodusschalter", @@ -2623,11 +2616,11 @@ "gtceu.key.enable_jetpack": "Aktiviere Jetpack", "gtceu.key.enable_step_assist": "Aktiviere StepAssist", "gtceu.key.tool_aoe_change": "Werkzeug-AoE-Modusschalter", - "gtceu.large_boiler": "Großer Kessel", - "gtceu.large_chemical_reactor": "Großer Chemiereaktor", - "gtceu.laser_engraver": "Lasergravierer", - "gtceu.lathe": "Drehbank", - "gtceu.macerator": "Mazerator", + "recipe_type.gtceu.large_boiler": "Großer Kessel", + "recipe_type.gtceu.large_chemical_reactor": "Großer Chemiereaktor", + "recipe_type.gtceu.laser_engraver": "Lasergravierer", + "recipe_type.gtceu.lathe": "Drehbank", + "recipe_type.gtceu.macerator": "Mazerator", "gtceu.machine.active_transformer.tooltip.0": "§7Transformers: Verkleidete Laser", "gtceu.machine.active_transformer.tooltip.1": "§7Kann eine beliebige Anzahl von Energie-§fInputs§7 in eine beliebige Anzahl von Energie-§fOutputs§7 kombinieren.", "gtceu.machine.active_transformer.tooltip.2": "§7Kann Energie über eine unglaubliche Entfernung übertragen", @@ -2640,8 +2633,8 @@ "gtceu.machine.available_recipe_map_4.tooltip": "Verfügbare Rezepttypen: %s, %s, %s, %s", "gtceu.machine.basic.input_from_output_side.allow": "Eingabe von der Ausgabeseite zulassen:", "gtceu.machine.basic.input_from_output_side.disallow": "Eingabe von der Ausgabeseite verbieten:", - "gtceu.machine.batch_disabled": "Stapelverarbeitung deaktiviert", - "gtceu.machine.batch_enabled": "Stapelverarbeitung aktiviert", + "gtceu.machine.batching.disabled": "Stapelverarbeitung deaktiviert", + "gtceu.machine.batching.enabled": "Stapelverarbeitung aktiviert", "gtceu.machine.bedrock_ore_miner.depletion": "§bErschöpfungsrate: §f%s%%", "gtceu.machine.bedrock_ore_miner.description": "§7Bohrt Erze aus Adern unter dem Grundgestein.", "gtceu.machine.bedrock_ore_miner.production": "§eProduktionsmultiplikator: §f%dx, %fx übertaktet", @@ -3255,7 +3248,7 @@ "gtceu.maintenance.configurable_time.changed_description": "Wartungsprobleme treten mit der %fx-fachen Rate auf.", "gtceu.maintenance.configurable_time.unchanged_description": "Wartungsprobleme treten im Normalfall auf. Änder die Konfiguration, um sie zu aktualisieren.", "gtceu.minimap.ore_vein.depleted": "Erschöpft", - "gtceu.mixer": "Mischer", + "recipe_type.gtceu.mixer": "Mischer", "gtceu.mode.both": "§dSowohl (Flüssigkeit als auch Item)§r", "gtceu.mode.fluid": "§9Flüssigkeit§r", "gtceu.mode.item": "§6Item§r", @@ -3502,11 +3495,11 @@ "gtceu.oc.tooltip.2": "Klicke mit der rechten Maustaste, um den OC zu verringern", "gtceu.oc.tooltip.3": "Klicke mit der mittleren Maustaste, um das OC zurückzusetzen", "gtceu.oc.tooltip.4": "Halte die Shift-Taste gedrückt, um zu Perfect OC zu wechseln", - "gtceu.ore_washer": "Erzwäscher", + "recipe_type.gtceu.ore_washer": "Erzwäscher", "gtceu.ownership.name.argonauts": "Argonautengilde", "gtceu.ownership.name.ftb": "FTB-Teams", "gtceu.ownership.name.player": "Spieler", - "gtceu.packer": "Packstation", + "recipe_type.gtceu.packer": "Packstation", "gtceu.part_sharing.disabled": "Multiblock-Freigabe §4Deaktiviert", "gtceu.part_sharing.enabled": "Multiblock-Freigabe §aAktiviert", "gtceu.placeholder_info.active.0": "Gibt eine 1 zurück, wenn der Block, an dem die Abdeckung befestigt ist, gerade ein Rezept ausführt, andernfalls 0.", @@ -3728,20 +3721,20 @@ "gtceu.placeholder_info.voltage.0": "Gibt die Spannung in dem Draht/Kabel zurück, an dem sich die Abdeckung befindet.", "gtceu.placeholder_info.voltage.1": "Verwendung:", "gtceu.placeholder_info.voltage.2": "{voltage} -> die Spannung im Draht/Kabel", - "gtceu.plasma_generator": "Plasmagenerator", - "gtceu.polarizer": "Polarisator", - "gtceu.primitive_blast_furnace": "Primitiver Hochofen", + "recipe_type.gtceu.plasma_generator": "Plasmagenerator", + "recipe_type.gtceu.polarizer": "Polarisator", + "recipe_type.gtceu.primitive_blast_furnace": "Primitiver Hochofen", "gtceu.provider.computer_monitor_cover.error.no_target": "Für die Monitorgruppe wurde kein Ziel ausgewählt", - "gtceu.pyrolyse_oven": "Pyrolyseofen", + "recipe_type.gtceu.pyrolyse_oven": "Pyrolyseofen", "gtceu.recipe.byproduct_tier": "Nebenprodukte von %s§r+", - "gtceu.recipe.category.arc_furnace_recycling": "Lichtbogenverschrottung", - "gtceu.recipe.category.chem_dyes": "Chemisches Färben", - "gtceu.recipe.category.extractor_recycling": "Umschmelzen von Schrott", - "gtceu.recipe.category.ingot_molding": "Metallformung", - "gtceu.recipe.category.macerator_recycling": "Teileschleifen", - "gtceu.recipe.category.ore_bathing": "Erzbehandlung", - "gtceu.recipe.category.ore_crushing": "Erzmahlen", - "gtceu.recipe.category.ore_forging": "Erzzerkleinerung", + "recipe_category.gtceu.arc_furnace_recycling": "Lichtbogenverschrottung", + "recipe_category.gtceu.chem_dyes": "Chemisches Färben", + "recipe_category.gtceu.extractor_recycling": "Umschmelzen von Schrott", + "recipe_category.gtceu.ingot_molding": "Metallformung", + "recipe_category.gtceu.macerator_recycling": "Teileschleifen", + "recipe_category.gtceu.ore_bathing": "Erzbehandlung", + "recipe_category.gtceu.ore_crushing": "Erzmahlen", + "recipe_category.gtceu.ore_forging": "Erzzerkleinerung", "gtceu.recipe.chance": "Chance: %s +%s/Stufe", "gtceu.recipe.cleanroom": "Erfordert %s", "gtceu.recipe.cleanroom.display_name": "Reinraum", @@ -3782,15 +3775,15 @@ "gtceu.recipe_modifier.insufficient_voltage": "Spannungsstufe zu niedrig", "gtceu.recipe_type.show_recipes": "Rezepte anzeigen", "gtceu.rei.group.potion_fluids": "Trankflüssigkeiten", - "gtceu.research_station": "Forschungsstation", - "gtceu.rock_breaker": "Steinbrecher", - "gtceu.scanner": "Scanner", + "recipe_type.gtceu.research_station": "Forschungsstation", + "recipe_type.gtceu.rock_breaker": "Steinbrecher", + "recipe_type.gtceu.scanner": "Scanner", "gtceu.scanner.copy_stick_empty": "§oLeerer Stick", "gtceu.scanner.copy_stick_from": "§oBleibe beim Kopieren", "gtceu.scanner.copy_stick_to": "§oKopie des Sticks", - "gtceu.sifter": "Sieb", - "gtceu.steam_boiler": "Dampfkessel", - "gtceu.steam_turbine": "Dampfturbine", + "recipe_type.gtceu.sifter": "Sieb", + "recipe_type.gtceu.steam_boiler": "Dampfkessel", + "recipe_type.gtceu.steam_turbine": "Dampfturbine", "gtceu.subtitle.arc": "Bögen summen", "gtceu.subtitle.assembler": "Montierer-Konstruktion", "gtceu.subtitle.bath": "Sprudelndes Bad", @@ -3830,7 +3823,7 @@ "gtceu.subtitle.turbine": "Turbine zischt", "gtceu.subtitle.wirecutter": "Draht abgeschnitten", "gtceu.subtitle.wrench": "Schraubenschlüssel klappert", - "gtceu.thermal_centrifuge": "Thermische Zentrifuge", + "recipe_type.gtceu.thermal_centrifuge": "Thermische Zentrifuge", "gtceu.tool.class.axe": "Axt", "gtceu.tool.class.butchery_knife": "Metzgermesser", "gtceu.tool.class.crowbar": "Brecheisen", @@ -3983,8 +3976,8 @@ "gtceu.universal.tooltip.working_area_chunks": "§bArbeitsbereich: §f%dx%d Chunks", "gtceu.universal.tooltip.working_area_chunks_max": "§bMax. Arbeitsbereich: §f%dx%d Chunks", "gtceu.universal.tooltip.working_area_max": "§bMax. Arbeitsbereich: §f%dx%d", - "gtceu.vacuum_freezer": "Vakuum-Gefrierschrank", - "gtceu.wiremill": "Drahtmühle", + "recipe_type.gtceu.vacuum_freezer": "Vakuum-Gefrierschrank", + "recipe_type.gtceu.wiremill": "Drahtmühle", "gui.gtceu.refund_all.desc": "Gebe gespeicherte Inhalte an AE2 zurück", "gui.gtceu.rename.desc": "Musterpuffer umbenennen", "gui.gtceu.share_inventory.desc.0": "Teilt eingefügte Elemente mit allen Mustern im Puffer!", @@ -3993,7 +3986,6 @@ "gui.gtceu.share_tank.desc.0": "Anteile eingebrachter Flüssigkeiten/Gase/etc. mit allen Mustern im Puffer!", "gui.gtceu.share_tank.title": "Gemeinsames Tankinventar", "gui.widget.incrementButton.default_tooltip": "Halte Shift-, Strg- oder beide Tasten gedrückt, um die Menge zu ändern", - "gui.widget.recipeProgressWidget.default_tooltip": "Rezepte anzeigen", "item.glass_lens": "Glaslinse (weiß)", "item.gtceu.activity_detector_cover": "Aktivitätsdetektor", "item.gtceu.activity_detector_cover.tooltip": "§7Gibt §fAktivitätsstatus§7 als Redstone als §fAbdeckung§7 aus.", @@ -4241,11 +4233,11 @@ "item.gtceu.fullers_earth_dust": "Fullers Erde", "item.gtceu.garnet_sand_dust": "Granatsand", "item.gtceu.gear_casting_mold": "Gussform (Zahnrad)", - "item.gtceu.gear_casting_mold.small.tooltip": "§7Form zur Herstellung kleiner Zahnräder", + "item.gtceu.small_gear_casting_mold.tooltip": "§7Form zur Herstellung kleiner Zahnräder", "item.gtceu.gear_casting_mold.tooltip": "§7Form zur Herstellung von Zahnrädern", "item.gtceu.gear_extruder_mold": "Extruderform (Zahnrad)", "item.gtceu.gear_extruder_mold.tooltip": "§7Extruderform zur Herstellung von Zahnrädern", - "item.gtceu.gear_small_extruder_mold.tooltip": "§7Extruderform zur Herstellung kleiner Zahnräder", + "item.gtceu.small_gear_extruder_mold.tooltip": "§7Extruderform zur Herstellung kleiner Zahnräder", "item.gtceu.gelled_toluene": "Geliertes Toluol", "item.gtceu.gelled_toluene.tooltip": "§7Roher Sprengstoff", "item.gtceu.glass_gem": "Glaskristall", @@ -4334,9 +4326,9 @@ "item.gtceu.item_filter": "Itemfilter", "item.gtceu.item_filter.tooltip.0": "§7Filtert §fElement§7-E/A als §fCover§7.", "item.gtceu.item_filter.tooltip.1": "Kann als Upgrade für §fFördermodul§7 und §fRoboterarm§7 verwendet werden.", - "item.gtceu.item_smart_filter": "Smart-Item-Filter", - "item.gtceu.item_smart_filter.tooltip.0": "§7Filtert §fItem§7-E/A mit §fMaschinenrezepten§7 als §fAbdeckung§7.", - "item.gtceu.item_smart_filter.tooltip.1": "Kann als Upgrade für §fFördermodul§7 und §fRoboterarm§7 verwendet werden.", + "item.gtceu.smart_item_filter": "Smart-Item-Filter", + "item.gtceu.smart_item_filter.tooltip.0": "§7Filtert §fItem§7-E/A mit §fMaschinenrezepten§7 als §fAbdeckung§7.", + "item.gtceu.smart_item_filter.tooltip.1": "Kann als Upgrade für §fFördermodul§7 und §fRoboterarm§7 verwendet werden.", "item.gtceu.item_tag_filter": "Item-Tag-Filter", "item.gtceu.item_tag_filter.tooltip.0": "§7Filtert §fItem§7-E/A mit §fItem-Tags§7 als §fCover§7.", "item.gtceu.item_tag_filter.tooltip.1": "Kann als Upgrade für §fFördermodul§7 und §fRoboterarm§7 verwendet werden.", @@ -4559,16 +4551,16 @@ "item.gtceu.pill_casting_mold": "Gießform (Pille)", "item.gtceu.pink_dye_spray_can": "Sprühdose (Rosa)", "item.gtceu.pink_glass_lens": "Glaslinse (Rosa)", - "item.gtceu.pipe.huge_casting_mold.tooltip": "§7Form zur Herstellung von Vollblockrohren", - "item.gtceu.pipe.huge_extruder_mold.tooltip": "§7Extruderform zur Herstellung von Vollblockrohren", - "item.gtceu.pipe.large_casting_mold.tooltip": "§7Form zur Herstellung großer Pfeifen", - "item.gtceu.pipe.large_extruder_mold.tooltip": "§7Extruderform zur Herstellung großer Rohre", - "item.gtceu.pipe.normal_casting_mold.tooltip": "§7Form zur Herstellung von Pfeifen", - "item.gtceu.pipe.normal_extruder_mold.tooltip": "§7Extruderform zur Herstellung von Rohren", - "item.gtceu.pipe.small_casting_mold.tooltip": "§7Form zur Herstellung kleiner Pfeifen", - "item.gtceu.pipe.small_extruder_mold.tooltip": "§7Extruderform zur Herstellung kleiner Rohre", - "item.gtceu.pipe.tiny_casting_mold.tooltip": "§7Form zur Herstellung winziger Pfeifen", - "item.gtceu.pipe.tiny_extruder_mold.tooltip": "§7Extruderform zur Herstellung winziger Rohre", + "item.gtceu.huge_pipe_casting_mold.tooltip": "§7Form zur Herstellung von Vollblockrohren", + "item.gtceu.huge_pipe_extruder_mold.tooltip": "§7Extruderform zur Herstellung von Vollblockrohren", + "item.gtceu.large_pipe_casting_mold.tooltip": "§7Form zur Herstellung großer Pfeifen", + "item.gtceu.large_pipe_extruder_mold.tooltip": "§7Extruderform zur Herstellung großer Rohre", + "item.gtceu.normal_pipe_casting_mold.tooltip": "§7Form zur Herstellung von Pfeifen", + "item.gtceu.normal_pipe_extruder_mold.tooltip": "§7Extruderform zur Herstellung von Rohren", + "item.gtceu.small_pipe_casting_mold.tooltip": "§7Form zur Herstellung kleiner Pfeifen", + "item.gtceu.small_pipe_extruder_mold.tooltip": "§7Extruderform zur Herstellung kleiner Rohre", + "item.gtceu.tiny_pipe_casting_mold.tooltip": "§7Form zur Herstellung winziger Pfeifen", + "item.gtceu.tiny_pipe_extruder_mold.tooltip": "§7Extruderform zur Herstellung winziger Rohre", "item.gtceu.pitchblende_dust": "Pechblende", "item.gtceu.plant_ball": "Pflanzenball", "item.gtceu.plastic_circuit_board": "Kunststoffplatine", @@ -4661,7 +4653,7 @@ "item.gtceu.rock_salt_dust": "Steinsalz", "item.gtceu.rod_extruder_mold": "Extruderform (Stab)", "item.gtceu.rod_extruder_mold.tooltip": "§7Extruderform zur Herstellung von Stäben", - "item.gtceu.rod_long_extruder_mold.tooltip": "§7Extruderform zur Herstellung langer Stäbe", + "item.gtceu.long_rod_extruder_mold.tooltip": "§7Extruderform zur Herstellung langer Stäbe", "item.gtceu.rotor_casting_mold": "Gussform (Rotor)", "item.gtceu.rotor_casting_mold.tooltip": "§7Form zur Herstellung von Rotoren", "item.gtceu.rotor_extruder_mold": "Extruderform (Rotor)", @@ -5274,7 +5266,7 @@ "material.gtceu.goethite": "Goethit", "material.gtceu.gold": "Gold", "material.gtceu.granite": "Granit", - "material.gtceu.granite_red": "Granit rot", + "material.gtceu.red_granite": "Granit rot", "material.gtceu.granitic_mineral_sand": "Granitischer Mineralsand", "material.gtceu.graphene": "Graphen", "material.gtceu.graphite": "Graphit", @@ -5444,9 +5436,9 @@ "material.gtceu.octane": "Oktan", "material.gtceu.oganesson": "Oganesson", "material.gtceu.oil": "Öl", - "material.gtceu.oil_heavy": "Schweröl", - "material.gtceu.oil_light": "Leichtes Öl", - "material.gtceu.oil_medium": "Rohöl", + "material.gtceu.heavy_oil": "Schweröl", + "material.gtceu.light_oil": "Leichtes Öl", + "material.gtceu.raw_oil": "Rohöl", "material.gtceu.oilsands": "Ölsande", "material.gtceu.olivine": "Olivin", "material.gtceu.opal": "Opal", @@ -5474,7 +5466,7 @@ "material.gtceu.platinum_group_sludge": "Schlamm der Platingruppe", "material.gtceu.platinum_raw": "Rohes Platin", "material.gtceu.platinum_sludge_residue": "Platinschlammrückstände", - "material.gtceu.plutonium": "Plutonium", + "material.gtceu.plutonium_239": "Plutonium 239", "material.gtceu.plutonium_241": "Plutonium 241", "material.gtceu.pollucite": "Pollucit", "material.gtceu.polonium": "Polonium", @@ -5658,7 +5650,7 @@ "material.gtceu.tungstic_acid": "Wolframsäure", "material.gtceu.ultimet": "Ultimet", "material.gtceu.uraninite": "Uraninit", - "material.gtceu.uranium": "Uran", + "material.gtceu.uranium_238": "Uran 238", "material.gtceu.uranium_235": "Uran 235", "material.gtceu.uranium_hexafluoride": "Uranhexafluorid", "material.gtceu.uranium_rhodium_dinaquadide": "Uran-Rhodium-Dinaquadid", @@ -5796,11 +5788,11 @@ "metaitem.machine_configuration.mode": "§aKonfigurationsmodus: §r%s", "metaitem.plugin.proxy.tooltips.1": "(Bitte den Proxy-Modus am Bildschirm einstellen)", "metaitem.plugin.tooltips.1": "Für mehr Funktionalität können dem Bildschirm Plugins hinzugefügt werden.", - "metaitem.prospector.mode.bedrock_ore": "§bGrundgesteins-Erzprospektionsmodus§r", - "metaitem.prospector.mode.fluid": "§bFlüssigkeits-Prospektionsmodus§r", - "metaitem.prospector.mode.ores": "§aErzprospektionsmodus§r", - "metaitem.prospector.tooltip.modes": "Verfügbare Modi:", - "metaitem.prospector.tooltip.radius": "Scannt einen Bereich mit %s Chunks Radius", + "behavior.prospector.mode.bedrock_ore": "§bGrundgesteins-Erzprospektionsmodus§r", + "behavior.prospector.mode.fluid": "§bFlüssigkeits-Prospektionsmodus§r", + "behavior.prospector.mode.ores": "§aErzprospektionsmodus§r", + "behavior.prospector.tooltip.modes": "Verfügbare Modi:", + "behavior.prospector.tooltip.radius": "Scannt einen Bereich mit %s Chunks Radius", "metaitem.record.sus.tooltip": "§7Leonz – Among Us Drip", "metaitem.terminal.tooltip": "Scharfe Werkzeuge leisten gute Arbeit", "metaitem.terminal.tooltip.creative": "§bKreativmodus", @@ -5855,7 +5847,7 @@ "tagprefix.blackstone": "Blackstone-%s-Erz", "tagprefix.block": "%s-Block", "tagprefix.bolt": "%s Bolzen", - "tagprefix.buzz_saw_blade": "%s Kreissägeblatt", + "tagprefix.buzzsaw_blade": "%s Kreissägeblatt", "tagprefix.cable_gt_double": "2x %s Kabel", "tagprefix.cable_gt_hex": "16x %s Kabel", "tagprefix.cable_gt_octal": "8x %s Kabel", @@ -5954,14 +5946,6 @@ "tagprefix.wire_gt_quadruple": "4x %s Kabel", "tagprefix.wire_gt_single": "1x %s Kabel", "tagprefix.wrench_tip": "%s Schraubenschlüsselspitze", - "tile.gtceu.brittle_charcoal.name": "Spröde Holzkohle", - "tile.gtceu.brittle_charcoal.tooltip.0": "Hergestellt vom Charcoal Pile Igniter.", - "tile.gtceu.brittle_charcoal.tooltip.1": "Baue das ab, um Kohle zu bekommen.", - "tile.gtceu.foam.name": "Schaum", - "tile.gtceu.petrified_foam.name": "Versteinerter Schaum", - "tile.gtceu.reinforced_foam.name": "Verstärkter Schaumstoff", - "tile.gtceu.reinforced_stone.name": "Verstärkter Stein", - "tile.gtceu.seal.name": "Versiegelter Block", "tooltip.gtceu.antidote.description": "§aGegenmittel §7Halte die Shift-Taste gedrückt, um Details anzuzeigen", "tooltip.gtceu.antidote.description.effect_removed": "Entfernt %s%% der Effekte der aktuellen Bedingungen", "tooltip.gtceu.antidote.description.effect_removed.all": "Entfernt alle Auswirkungen der aktuellen Bedingungen", diff --git a/src/main/resources/assets/gtceu/lang/ja_jp.json b/src/main/resources/assets/gtceu/lang/ja_jp.json index 13f4b4fbbde..a3e6b05e527 100644 --- a/src/main/resources/assets/gtceu/lang/ja_jp.json +++ b/src/main/resources/assets/gtceu/lang/ja_jp.json @@ -93,7 +93,7 @@ "behaviour.soft_hammer.disabled_cycle": "現在のサイクル終了後に作業を無効化", "behaviour.soft_hammer.enabled": "作業開始", "behaviour.wrench": "右クリックでブロックを回転", - "block.filter_casing.tooltip": "§a無塵§7環境を構築する", + "block.gtceu.filter_casing.tooltip": "§a無塵§7環境を構築する", "block.gtceu.acid_hazard_sign_block": "酸危害警告ブロック", "block.gtceu.active_transformer": "大型変圧器", "block.gtceu.advanced_computer_casing": "発展型コンピュータ外装", @@ -797,7 +797,7 @@ "block.gtceu.me_pattern_buffer_proxy": "MEパターンバッファプロキシ", "block.gtceu.me_stocking_input_bus": "ME在庫搬入バス", "block.gtceu.me_stocking_input_hatch": "ME在庫搬入ハッチ", - "block.gtceu.mega_blast_furnace": "回転式炉床炉", + "block.gtceu.rotary_hearth_furnace": "回転式炉床炉", "block.gtceu.mega_vacuum_freezer": "一括真空冷却機", "block.gtceu.miner_pipe": "鉱夫パイプ", "block.gtceu.mob_infestation_hazard_sign_block": "モブ侵入危害警告ブロック", @@ -989,7 +989,7 @@ "block.gtceu.orange_metal_sheet": "橙色の板金ブロック", "block.gtceu.orange_studs": "橙鋲", "block.gtceu.overworld_marker": "オーバーワールド", - "block.gtceu.palladium_substation": "パラジウム製大型蓄電器用外装", + "block.gtceu.palladium_substation_casing": "パラジウム製大型蓄電器用外装", "block.gtceu.pattern_buffer.desc.0": "§fマルチブロックのために §6AE2 パターンを直接保存できる。", "block.gtceu.pattern_buffer.desc.1": "§fAE2 パターンは、§6 共有インベントリ§fウィジェットに格納されているものなら何でも利用できる。", "block.gtceu.pattern_buffer.desc.2": "§fリンク§6パターンバッファ マシンをリンクするための§bデータスティック§fを持つプロキシ!", @@ -1701,7 +1701,7 @@ "block.gtceu.zpm_transformer_4a": "4A対応§cZPM§r変圧器", "block.gtceu.zpm_wiremill": "§c精鋭型ワイヤー作製機 III§r", "block.gtceu.zpm_world_accelerator": "§c精鋭型世界加速機 III§r", - "block.sterilizing_filter_casing.tooltip": "§a滅菌§7環境を構築する", + "block.gtceu.sterilizing_filter_casing.tooltip": "§a滅菌§7環境を構築する", "block.gtceu.surface_rock": "%sの小石", "button.gtceu.mark_as_depleted.name": "枯渇済みとしてマーク", "button.gtceu.toggle_waypoint.name": "ウェイポイントを切り替え", @@ -1725,8 +1725,6 @@ "command.gtceu.share_prospection_data.notification": "%sが探査データをあなたと共有しています!", "config.gtceu.option.addLoot": "戦利品の追加", "config.gtceu.option.ae2": "AE2", - "config.gtceu.option.allUniqueStoneTypes": "すべてのユニークな石の種類", - "config.gtceu.option.allowDrumsInputFluidsFromOutputSide": "ドラム缶の出力側からの液体入力を許可する", "config.gtceu.option.animationTime": "アニメーション時間", "config.gtceu.option.arcRecyclingYield": "アーク炉リサイクル収率", "config.gtceu.option.armorHud": "防具HUD", @@ -2063,7 +2061,6 @@ "cover.pump.mode.import": "モード: 搬入", "cover.pump.title": "%s ポンプカバー設定", "cover.pump.transfer_rate": "%s", - "cover.robotic_arm.title": "%s ロボットアーム設定", "cover.robotic_arm.transfer_mode.description.0": "§e任意の転送§r - このモードでは、カバーはそのフィルタに一致するできるだけ多くのアイテムを転送します。", "cover.robotic_arm.transfer_mode.description.1": "§e正確な供給§r - このモードでは、カバーはアイテムフィルタースロットに指定された分量（またはタグフィルターの下にある変数）でアイテムを供給します。アイテムの量が指定された分量未満の場合、アイテムは移動しません。", "cover.robotic_arm.transfer_mode.description.2": "§e正確に保つ§r - このモードでは、カバーが目的地のインベントリに指定された量のアイテムを保持し、必要に応じて追加量のアイテムを供給する。", @@ -2118,8 +2115,6 @@ "death.attack.gtceu.drill_lv": "%s は %s に32Vドリルで穴を開けられた。", "death.attack.gtceu.drill_mv": "%s は %s に128Vドリルで穴を開けられた。", "death.attack.gtceu.electric": "%s は電気工事士ではなかった。", - "death.attack.gtceu.explosion": "%s の遺体が全国各地で発見された。", - "death.attack.gtceu.explosion.player": "%s は %s のおかげで爆発した。", "death.attack.gtceu.file": "%s の身を削る努力は %s によって実現した。", "death.attack.gtceu.frost": "%s のふとんがふっとんだ。", "death.attack.gtceu.hammer": "%s の身長は %s より低くなった。", @@ -2162,8 +2157,6 @@ "enchantment.gtceu.disjunction.description": "エンド関係のmobに弱体化と鈍足を付与する。", "enchantment.gtceu.hard_hammer.description": "ブロックを壊したときGregTechのハンマーで採掘したときと同じ挙動になる。", "enchantment.hard_hammer": "ハンマリング", - "entity.gtceu.boat": "ボート", - "entity.gtceu.chest_boat": "チェスト付きボート", "entity.gtceu.dynamite": "ダイナマイト", "entity.gtceu.industrial_tnt": "工業用TNT", "entity.gtceu.powderbarrel": "火薬樽", @@ -2173,19 +2166,19 @@ "fluid.tile.lava": "溶岩", "fluid.tile.water": "水", "fluid_cell.empty": "空", - "gtceu.air_scrubber": "空気洗浄機s", - "gtceu.alloy_blast_smelter": "合金高炉", - "gtceu.alloy_smelter": "合金製錬炉", - "gtceu.arc_furnace": "アーク炉", - "gtceu.assembler": "組立機", - "gtceu.assembly_line": "アセンブリライン", + "recipe_type.gtceu.air_scrubber": "空気洗浄機s", + "recipe_type.gtceu.alloy_blast_smelter": "合金高炉", + "recipe_type.gtceu.alloy_smelter": "合金製錬炉", + "recipe_type.gtceu.arc_furnace": "アーク炉", + "recipe_type.gtceu.assembler": "組立機", + "recipe_type.gtceu.assembly_line": "アセンブリライン", "gtceu.auto_decomp.rotor": "タービンローター", "gtceu.auto_decomp.tool": "非電動ツール", - "gtceu.autoclave": "オートクレーブ", + "recipe_type.gtceu.autoclave": "オートクレーブ", "gtceu.battery_buffer.average_input": "入力平均: %s EU/t", "gtceu.battery_buffer.average_output": "出力平均: %s EU/t", - "gtceu.bender": "金属加工機", - "gtceu.brewery": "醸造機", + "recipe_type.gtceu.bender": "金属加工機", + "recipe_type.gtceu.brewery": "醸造機", "gtceu.bus.collapse.error": "バスは最初にマルチブロックに接続されなければならない", "gtceu.bus.collapse_false": "バス内でアイテムを整頓を行わない", "gtceu.bus.collapse_true": "バス内でアイテムを整頓を行う", @@ -2197,7 +2190,7 @@ "gtceu.cable.loss_per_block": "§cLoss/Meter/Ampere:§r §c%d§7 EU-Volt", "gtceu.cable.superconductor": "%s §dSuperconductor", "gtceu.cable.voltage": "§aMax Voltage:§r §a%d §a(%s§a)", - "gtceu.canner": "缶詰機", + "recipe_type.gtceu.canner": "缶詰機", "gtceu.central_monitor.gui.create_group": "グループを作成", "gtceu.central_monitor.gui.currently_editing": "現在編集中: %s", "gtceu.central_monitor.gui.remove_from_group": "グループから削除", @@ -2212,19 +2205,19 @@ "gtceu.central_monitor.info_tooltip.7": "目的のブロックにカバーを設置し、データスティックで右クリックして、そのデータスティックをマルチブロックのデータアクセスハッチに入れます。", "gtceu.central_monitor.info_tooltip.8": "次に、データアクセスハッチをターゲットとして選択し、表示された数値フィールドにデータスティックのスロットインデックスを設定します。", "gtceu.central_monitor.size": "サイズ: (%d+1+%d)x(%d+1+%d)", - "gtceu.centrifuge": "遠心分離機", + "recipe_type.gtceu.centrifuge": "遠心分離機", "gtceu.chance_logic.and": "AND", "gtceu.chance_logic.first": "FIRST", "gtceu.chance_logic.none": "NONE", "gtceu.chance_logic.or": "OR", "gtceu.chance_logic.xor": "XOR", "gtceu.chat.cape": "§おめでとうございます!使うにはターミナルのマントセレクタのアプリを参照してください§r", - "gtceu.chemical_bath": "化学槽", - "gtceu.chemical_reactor": "化学反応器", - "gtceu.circuit_assembler": "回路組立機", - "gtceu.coke_oven": "コークス炉", - "gtceu.combustion_generator": "燃焼発電機", - "gtceu.compressor": "圧縮機", + "recipe_type.gtceu.chemical_bath": "化学槽", + "recipe_type.gtceu.chemical_reactor": "化学反応器", + "recipe_type.gtceu.circuit_assembler": "回路組立機", + "recipe_type.gtceu.coke_oven": "コークス炉", + "recipe_type.gtceu.combustion_generator": "燃焼発電機", + "recipe_type.gtceu.compressor": "圧縮機", "gtceu.computer_monitor_cover.error.bf_invalid": "位置%dに無効な文字があります", "gtceu.computer_monitor_cover.error.bf_invalid_num": "%d番目のシンボル処理中、インデックス%dに無効な数値があります", "gtceu.computer_monitor_cover.error.exception": "予期せぬ例外が発生しました: %s", @@ -2250,7 +2243,7 @@ "gtceu.cover.fluid_detector.message_fluid_storage_normal": "正常な体液貯留のモニタリング", "gtceu.cover.item_detector.message_item_storage_inverted": "反転アイテムストレージのモニタリング", "gtceu.cover.item_detector.message_item_storage_normal": "正常なアイテムストレージのモニタリング", - "gtceu.cracker": "接触分解装置", + "recipe_type.gtceu.cracker": "接触分解装置", "gtceu.creative.activity.off": "停止中", "gtceu.creative.activity.on": "稼働中", "gtceu.creative.chest.ipc": "アイテム毎サイクル", @@ -2267,7 +2260,7 @@ "gtceu.creative_tooltip.1": "§7必要なのは", "gtceu.creative_tooltip.2": " クリエイティブ・モード", "gtceu.creative_tooltip.3": "§7 を使用する。", - "gtceu.cutter": "裁断機", + "recipe_type.gtceu.cutter": "裁断機", "gtceu.debug.f3_h.enabled": "GregTechがデバッグ情報を修正しました! 開発者向け: GregTech.cfgのmisc:debug設定オプションを有効にすることでより多くの情報を見ることができます。", "gtceu.direction.tooltip.back": "後ろ", "gtceu.direction.tooltip.down": "下", @@ -2277,20 +2270,20 @@ "gtceu.direction.tooltip.up": "上", "gtceu.display_source.computer_monitor_cover": "コンピュータモニターカバー", "gtceu.display_target.computer_monitor_cover": "コンピュータモニターカバー", - "gtceu.distillation_tower": "蒸留塔", - "gtceu.distillery": "蒸留機", + "recipe_type.gtceu.distillation_tower": "蒸留塔", + "recipe_type.gtceu.distillery": "蒸留機", "gtceu.duct_pipe.transfer_rate": "§b空気搬送速度: %s", - "gtceu.dummy": "ダミー", - "gtceu.electric_blast_furnace": "工業用電気炉", - "gtceu.electric_furnace": "電気かまど", - "gtceu.electrolyzer": "電解槽", - "gtceu.electromagnetic_separator": "電磁分離機", + "recipe_type.gtceu.dummy": "ダミー", + "recipe_type.gtceu.electric_blast_furnace": "工業用電気炉", + "recipe_type.gtceu.electric_furnace": "電気かまど", + "recipe_type.gtceu.electrolyzer": "電解槽", + "recipe_type.gtceu.electromagnetic_separator": "電磁分離機", "gtceu.ender_item_link_cover.title": "アイテムエンダーリンク", "gtceu.ender_redstone_link_cover.label": "レッドストーンパワー: %d", "gtceu.ender_redstone_link_cover.title": "レッドストーンエンダーリンク", - "gtceu.extractor": "抽出機", - "gtceu.extruder": "押出機", - "gtceu.fermenter": "発酵槽", + "recipe_type.gtceu.extractor": "抽出機", + "recipe_type.gtceu.extruder": "押出機", + "recipe_type.gtceu.fermenter": "発酵槽", "gtceu.fluid.amount": "§9量: %d/%d mB", "gtceu.fluid.click_combined": "§7液体コンテナで§7クリックし、タンクを§7満タンにするか、または§7満タンにする（満タンにするには Shift キーを押しながらクリックする）。", "gtceu.fluid.click_to_empty": "§7液体コンテナで§7クリックし、タンクを§7空にする（フルスタックにするにはShiftキーを押しながらクリックする）。", @@ -2308,7 +2301,7 @@ "gtceu.fluid.temperature": "§c温度: %d", "gtceu.fluid.temperature.cryogenic": "§b低温!取り扱い注意!", "gtceu.fluid.type_acid.tooltip": "§6酸性!取り扱い注意!", - "gtceu.fluid_heater": "液体加熱機", + "recipe_type.gtceu.fluid_heater": "液体加熱機", "gtceu.fluid_pipe.acid_proof": "§6酸を扱える", "gtceu.fluid_pipe.capacity": "§9容量: §f%d mB", "gtceu.fluid_pipe.channels": "§eチャンネル: §f%d", @@ -2317,15 +2310,15 @@ "gtceu.fluid_pipe.max_temperature": "§c温度限界: §f%s", "gtceu.fluid_pipe.not_gas_proof": "§4ガスが漏れる可能性がある!", "gtceu.fluid_pipe.plasma_proof": "§6すべてのプラズマに対応", - "gtceu.fluid_solidifier": "液体成型機", - "gtceu.forge_hammer": "鍛造機", - "gtceu.forming_press": "圧縮成型機", + "recipe_type.gtceu.fluid_solidifier": "液体成型機", + "recipe_type.gtceu.forge_hammer": "鍛造機", + "recipe_type.gtceu.forming_press": "圧縮成型機", "gtceu.forming_press.naming.named": "§o名前付きアイテム", "gtceu.forming_press.naming.press": "§o名前付きプレス", "gtceu.forming_press.naming.to_name": "§o名前を付けるアイテム", - "gtceu.fusion_reactor": "核融合炉", - "gtceu.gas_collector": "ガス収集機", - "gtceu.gas_turbine": "ガスタービン", + "recipe_type.gtceu.fusion_reactor": "核融合炉", + "recipe_type.gtceu.gas_collector": "ガス収集機", + "recipe_type.gtceu.gas_turbine": "ガスタービン", "gtceu.gui.adv_stocking_config.min_fluid_count": "自動引き出しのための最小液体スタックサイズ", "gtceu.gui.adv_stocking_config.min_item_count": "自動引き出しのための最小アイテムスタックサイズ", "gtceu.gui.adv_stocking_config.ticks_per_cycle": "アイテムリスト更新間の遅延", @@ -2457,7 +2450,7 @@ "tooltip.gtceu.hazard_trigger.none": "何もない", "tooltip.gtceu.hazard_trigger.protection": "保護する:", "tooltip.gtceu.hazard_trigger.skin_contact": "皮膚接触", - "gtceu.implosion_compressor": "内破圧縮機", + "recipe_type.gtceu.implosion_compressor": "内破圧縮機", "gtceu.io.both": "両方", "gtceu.io.export": "搬出", "gtceu.io.import": "搬入", @@ -2474,14 +2467,14 @@ "gtceu.jade.progress_computation": "%s / %s CWU", "gtceu.jade.progress_sec": "%s / %s s", "gtceu.jade.progress_tick": "%s / %s t", - "gtceu.jei.bedrock_fluid.heavy_oil_deposit": "重油油田", - "gtceu.jei.bedrock_fluid.lava_deposit": "溶岩田", - "gtceu.jei.bedrock_fluid.light_oil_deposit": "軽油油田", - "gtceu.jei.bedrock_fluid.natural_gas_deposit": "天然ガス田", - "gtceu.jei.bedrock_fluid.nether_natural_gas_deposit": "天然ガス田 (ネザー)", - "gtceu.jei.bedrock_fluid.oil_deposit": "油田", - "gtceu.jei.bedrock_fluid.raw_oil_deposit": "原油油田", - "gtceu.jei.bedrock_fluid.salt_water_deposit": "塩水田", + "bedrock_fluid.gtceu.heavy_oil_deposit": "重油油田", + "bedrock_fluid.gtceu.lava_deposit": "溶岩田", + "bedrock_fluid.gtceu.light_oil_deposit": "軽油油田", + "bedrock_fluid.gtceu.natural_gas_deposit": "天然ガス田", + "bedrock_fluid.gtceu.nether_natural_gas_deposit": "天然ガス田 (ネザー)", + "bedrock_fluid.gtceu.oil_deposit": "油田", + "bedrock_fluid.gtceu.raw_oil_deposit": "原油油田", + "bedrock_fluid.gtceu.salt_water_deposit": "塩水田", "gtceu.jei.bedrock_fluid_diagram": "岩盤液体図", "gtceu.jei.bedrock_ore_diagram": "岩盤鉱石図", "gtceu.jei.fluid.dep_amount_hover": "鉱脈の枯渇する量", @@ -2516,46 +2509,46 @@ "gtceu.jei.ore.surface_rock.0": "地表にある小石は鉱脈の生成位置を示します。", "gtceu.jei.ore.surface_rock.1": "破壊すると極小の粉を3個入手できる。また、幸運エンチャントが適用される。", "gtceu.jei.ore_processing_diagram": "鉱石処理工程図", - "gtceu.jei.ore_vein.apatite_vein": "アパタイト鉱脈", - "gtceu.jei.ore_vein.banded_iron_vein": "褐鉄鉱鉱脈", - "gtceu.jei.ore_vein.bauxite_vein_end": "エンドボーキサイト鉱脈", - "gtceu.jei.ore_vein.beryllium_vein": "ベリリウム鉱脈", - "gtceu.jei.ore_vein.cassiterite_vein": "錫鉱脈", - "gtceu.jei.ore_vein.certus_quartz": "ケルタスクオーツ鉱脈", - "gtceu.jei.ore_vein.coal_vein": "石炭鉱脈", - "gtceu.jei.ore_vein.copper_tin_vein": "銅-錫鉱脈", - "gtceu.jei.ore_vein.copper_vein": "銅鉱脈", - "gtceu.jei.ore_vein.diamond_vein": "ダイヤモンド鉱脈", - "gtceu.jei.ore_vein.galena_vein": "方鉛鉱鉱脈", - "gtceu.jei.ore_vein.garnet_tin_vein": "ガーネット-錫鉱脈", - "gtceu.jei.ore_vein.garnet_vein": "ガーネット鉱脈", - "gtceu.jei.ore_vein.iron_vein": "鉄鉱脈", - "gtceu.jei.ore_vein.lapis_vein": "ラピス鉱脈", - "gtceu.jei.ore_vein.lubricant_vein": "石鹸石鉱脈", - "gtceu.jei.ore_vein.magnetite_vein_end": "エンド磁鉄鉱鉱脈", - "gtceu.jei.ore_vein.magnetite_vein_ow": "オーバーワールド磁鉄鉱鉱脈", - "gtceu.jei.ore_vein.manganese_vein": "マンガン鉱脈", - "gtceu.jei.ore_vein.manganese_vein_ow": "オーバーワールドマンガン鉱脈", - "gtceu.jei.ore_vein.mica_vein": "雲母鉱脈", - "gtceu.jei.ore_vein.mineral_sand_vein": "石膏鉱脈", - "gtceu.jei.ore_vein.molybdenum_vein": "モリブデン鉱脈", - "gtceu.jei.ore_vein.monazite_vein": "モナザイト鉱脈", - "gtceu.jei.ore_vein.naquadah_vein": "ナクアダ鉱脈", - "gtceu.jei.ore_vein.nether_quartz_vein": "ネザー水晶鉱脈", - "gtceu.jei.ore_vein.nickel_vein": "ニッケル鉱脈", - "gtceu.jei.ore_vein.oilsands_vein": "オイルサンド鉱脈", - "gtceu.jei.ore_vein.olivine_vein": "オリビン鉱脈", - "gtceu.jei.ore_vein.pitchblende_vein_end": "エンド瀝青ウラン鉱鉱脈", - "gtceu.jei.ore_vein.redstone_vein": "赤石鉱脈", - "gtceu.jei.ore_vein.redstone_vein_ow": "オーバーワールド赤石鉱脈", - "gtceu.jei.ore_vein.saltpeter_vein": "硝石鉱脈", - "gtceu.jei.ore_vein.salts_vein": "塩鉱脈", - "gtceu.jei.ore_vein.sapphire_vein": "サファイア鉱脈", - "gtceu.jei.ore_vein.scheelite_vein": "タングステン鉱脈", - "gtceu.jei.ore_vein.sheldonite_vein": "プラチナ鉱脈", - "gtceu.jei.ore_vein.sulfur_vein": "硫黄鉱脈", - "gtceu.jei.ore_vein.tetrahedrite_vein": "四面銅鉱鉱脈", - "gtceu.jei.ore_vein.topaz_vein": "トパーズ鉱脈", + "ore_vein.gtceu.apatite": "アパタイト", + "ore_vein.gtceu.banded_iron": "褐鉄鉱", + "ore_vein.gtceu.end_bauxite": "エンドボーキサイト", + "ore_vein.gtceu.beryllium": "ベリリウム", + "ore_vein.gtceu.cassiterite": "錫", + "ore_vein.gtceu.certus_quartz": "ケルタスクオーツ", + "ore_vein.gtceu.coal": "石炭", + "ore_vein.gtceu.copper_tin": "銅-錫", + "ore_vein.gtceu.copper": "銅", + "ore_vein.gtceu.diamond": "ダイヤモンド", + "ore_vein.gtceu.galena": "方鉛鉱", + "ore_vein.gtceu.garnet_tin": "ガーネット-錫", + "ore_vein.gtceu.garnet": "ガーネット", + "ore_vein.gtceu.iron": "鉄", + "ore_vein.gtceu.lapis": "ラピス", + "ore_vein.gtceu.lubricant": "石鹸石", + "ore_vein.gtceu.end_magnetite": "エンド磁鉄鉱", + "ore_vein.gtceu.magnetite": "オーバーワールド磁鉄鉱", + "ore_vein.gtceu.nether_manganese": "マンガン", + "ore_vein.gtceu.manganese": "オーバーワールドマンガン", + "ore_vein.gtceu.mica": "雲母", + "ore_vein.gtceu.mineral_sand": "石膏", + "ore_vein.gtceu.molybdenum": "モリブデン", + "ore_vein.gtceu.monazite": "モナザイト", + "ore_vein.gtceu.naquadah": "ナクアダ", + "ore_vein.gtceu.nether_quartz": "ネザー水晶", + "ore_vein.gtceu.nickel": "ニッケル", + "ore_vein.gtceu.oilsands": "オイルサンド", + "ore_vein.gtceu.olivine": "オリビン", + "ore_vein.gtceu.pitchblende": "エンド瀝青ウラン鉱", + "ore_vein.gtceu.nether_redstone": "赤石", + "ore_vein.gtceu.redstone": "オーバーワールド赤石", + "ore_vein.gtceu.saltpeter": "硝石", + "ore_vein.gtceu.salts": "塩", + "ore_vein.gtceu.sapphire": "サファイア", + "ore_vein.gtceu.scheelite": "タングステン", + "ore_vein.gtceu.sheldonite": "プラチナ", + "ore_vein.gtceu.sulfur": "硫黄", + "ore_vein.gtceu.tetrahedrite": "四面銅鉱", + "ore_vein.gtceu.topaz": "トパーズ", "gtceu.jei.ore_vein_diagram": "鉱脈図", "gtceu.jei.ore_vein_diagram.chance": "§e生成確率: %s§r", "gtceu.jei.ore_vein_diagram.dimensions": "ディメンション:", @@ -2563,20 +2556,20 @@ "gtceu.jei.ore_vein_diagram.weight": "割合: %s", "gtceu.jei.programmed_circuit": "プログラム回路ページ", "gtceu.journeymap.options.layers": "探査層", - "gtceu.journeymap.options.layers.bedrock_fluids": "岩盤液体鉱床を表示", - "gtceu.journeymap.options.layers.hide_depleted": "枯渇した鉱床を隠す", - "gtceu.journeymap.options.layers.ore_veins": "鉱石鉱脈を表示", + "gtceu.button.bedrock_fluids": "岩盤液体鉱床を表示", + "gtceu.button.hide_depleted": "枯渇した鉱床を隠す", + "gtceu.button.ore_veins": "鉱石鉱脈を表示", "gtceu.key.armor_charging": "装備のインベントリ充電機能の切替", "gtceu.key.armor_hover": "装備のホバーモードの切替", "gtceu.key.armor_mode_switch": "装備のモード切替", "gtceu.key.enable_boots": "ブーストジャンプ切替", "gtceu.key.enable_jetpack": "ジェットパック有効無効切替", "gtceu.key.tool_aoe_change": "採掘範囲の切替", - "gtceu.large_boiler": "大型ボイラー", - "gtceu.large_chemical_reactor": "大型化学反応炉", - "gtceu.laser_engraver": "レーザー刻印機", - "gtceu.lathe": "旋盤", - "gtceu.macerator": "粉砕機", + "recipe_type.gtceu.large_boiler": "大型ボイラー", + "recipe_type.gtceu.large_chemical_reactor": "大型化学反応炉", + "recipe_type.gtceu.laser_engraver": "レーザー刻印機", + "recipe_type.gtceu.lathe": "旋盤", + "recipe_type.gtceu.macerator": "粉砕機", "gtceu.machine.active_transformer.tooltip.0": "§7レーザー式変圧器", "gtceu.machine.active_transformer.tooltip.1": "§7任意の数の§fエナジーハッチ§7と§fダイナモハッチ§7を組み合わせられる。", "gtceu.machine.active_transformer.tooltip.2": "§7で驚異的な超距離電力輸送ができる。", @@ -2589,8 +2582,8 @@ "gtceu.machine.available_recipe_map_4.tooltip": "使用可能なレシピの種類: %s, %s, %s, %s", "gtceu.machine.basic.input_from_output_side.allow": "出力側からの入力を許可する: ", "gtceu.machine.basic.input_from_output_side.disallow": "出力側からの入力を許可しない: ", - "gtceu.machine.batch_disabled": "バッチ処理無効", - "gtceu.machine.batch_enabled": "バッチ処理有効", + "gtceu.machine.batching.disabled": "バッチ処理無効", + "gtceu.machine.batching.enabled": "バッチ処理有効", "gtceu.machine.bedrock_ore_miner.depletion": "§b枯渇速度: §f%s%%", "gtceu.machine.bedrock_ore_miner.description": "§7岩盤下の鉱脈から鉱石を掘り出す。", "gtceu.machine.bedrock_ore_miner.production": "§e生産倍率: §f%dx、オーバークロックで%f倍", @@ -3467,11 +3460,11 @@ "gtceu.oc.tooltip.2": "右クリックでオーバークロックを遅くする", "gtceu.oc.tooltip.3": "ミドルクリックでオーバークロックをリセット", "gtceu.oc.tooltip.4": "シフトを押したまま完璧なオーバークロックに変更", - "gtceu.ore_washer": "鉱石洗浄機", + "recipe_type.gtceu.ore_washer": "鉱石洗浄機", "gtceu.ownership.name.argonauts": "アルゴノーツギルド", "gtceu.ownership.name.ftb": "FTBチーム", "gtceu.ownership.name.player": "プレイヤー", - "gtceu.packer": "梱包機", + "recipe_type.gtceu.packer": "梱包機", "gtceu.part_sharing.disabled": "マルチブロック共有 §4無効", "gtceu.part_sharing.enabled": "マルチブロック共有 §a有効", "gtceu.placeholder_info.active.0": "カバーが取り付けられているブロックが現在レシピを実行している場合は1を、それ以外の場合は0を返します。", @@ -3661,19 +3654,19 @@ "gtceu.placeholder_info.voltage.0": "カバーが取り付けられているワイヤー/ケーブルの電圧を返す。", "gtceu.placeholder_info.voltage.1": "使用法:", "gtceu.placeholder_info.voltage.2": " {voltage} -> ワイヤー/ケーブルの電圧", - "gtceu.plasma_generator": "プラズマ発生機", - "gtceu.polarizer": "磁化装置", - "gtceu.primitive_blast_furnace": "初歩的な溶鉱炉", - "gtceu.pyrolyse_oven": "熱分解炉", + "recipe_type.gtceu.plasma_generator": "プラズマ発生機", + "recipe_type.gtceu.polarizer": "磁化装置", + "recipe_type.gtceu.primitive_blast_furnace": "初歩的な溶鉱炉", + "recipe_type.gtceu.pyrolyse_oven": "熱分解炉", "gtceu.recipe.byproduct_tier": "%s§r+ からの副産物", - "gtceu.recipe.category.arc_furnace_recycling": "アーク炉スクラップ処理", - "gtceu.recipe.category.chem_dyes": "化学染色", - "gtceu.recipe.category.extractor_recycling": "スクラップ再溶解", - "gtceu.recipe.category.ingot_molding": "金属成形", - "gtceu.recipe.category.macerator_recycling": "部品研削", - "gtceu.recipe.category.ore_bathing": "鉱石処理", - "gtceu.recipe.category.ore_crushing": "鉱石研磨", - "gtceu.recipe.category.ore_forging": "鉱石粉砕", + "recipe_category.gtceu.arc_furnace_recycling": "アーク炉スクラップ処理", + "recipe_category.gtceu.chem_dyes": "化学染色", + "recipe_category.gtceu.extractor_recycling": "スクラップ再溶解", + "recipe_category.gtceu.ingot_molding": "金属成形", + "recipe_category.gtceu.macerator_recycling": "部品研削", + "recipe_category.gtceu.ore_bathing": "鉱石処理", + "recipe_category.gtceu.ore_crushing": "鉱石研磨", + "recipe_category.gtceu.ore_forging": "鉱石粉砕", "gtceu.recipe.chance": "確率: %s +%s/tier", "gtceu.recipe.cleanroom": "%sが必要", "gtceu.recipe.cleanroom.display_name": "クリーンルーム", @@ -3708,15 +3701,15 @@ "gtceu.recipe_memory_widget.tooltip.1": "§7シフトでレシピの固定化を設定", "gtceu.recipe_type.show_recipes": "レシピを表示", "gtceu.rei.group.potion_fluids": "ポーション液体", - "gtceu.research_station": "研究ステーション", - "gtceu.rock_breaker": "破砕機", - "gtceu.scanner": "スキャナー", + "recipe_type.gtceu.research_station": "研究ステーション", + "recipe_type.gtceu.rock_breaker": "破砕機", + "recipe_type.gtceu.scanner": "スキャナー", "gtceu.scanner.copy_stick_empty": "§o空のスティック", "gtceu.scanner.copy_stick_from": "§oスティックからコピー", "gtceu.scanner.copy_stick_to": "§oスティックをコピー", - "gtceu.sifter": "選別機", - "gtceu.steam_boiler": "蒸気ボイラー", - "gtceu.steam_turbine": "蒸気タービン", + "recipe_type.gtceu.sifter": "選別機", + "recipe_type.gtceu.steam_boiler": "蒸気ボイラー", + "recipe_type.gtceu.steam_turbine": "蒸気タービン", "gtceu.subtitle.arc": "鳴り響く円弧", "gtceu.subtitle.assembler": "アセンブラでの構築", "gtceu.subtitle.bath": "化学槽の発泡", @@ -3756,7 +3749,7 @@ "gtceu.subtitle.turbine": "タービン音", "gtceu.subtitle.wirecutter": "ワイヤーを切断音", "gtceu.subtitle.wrench": "レンチのガタつき", - "gtceu.thermal_centrifuge": "熱遠心分離機", + "recipe_type.gtceu.thermal_centrifuge": "熱遠心分離機", "gtceu.tool.class.axe": "斧", "gtceu.tool.class.butchery_knife": "肉切り包丁", "gtceu.tool.class.crowbar": "バール", @@ -3905,8 +3898,8 @@ "gtceu.universal.tooltip.working_area_chunks": "§b稼働範囲: §f%dx%d チャンク", "gtceu.universal.tooltip.working_area_chunks_max": "§b最大稼働範囲: §f%dx%d チャンク", "gtceu.universal.tooltip.working_area_max": "§b最大稼働範囲: §f%dx%d", - "gtceu.vacuum_freezer": "真空冷却機", - "gtceu.wiremill": "ワイヤー作製機", + "recipe_type.gtceu.vacuum_freezer": "真空冷却機", + "recipe_type.gtceu.wiremill": "ワイヤー作製機", "gui.gtceu.refund_all.desc": "蓄積されたコンテンツをAE2に戻す", "gui.gtceu.rename.desc": "パターンバッファの名前を変更する", "gui.gtceu.share_inventory.desc.0": "挿入されたアイテムをバッファ内のすべてのパターンと共有する!", @@ -3915,7 +3908,6 @@ "gui.gtceu.share_tank.desc.0": "挿入された流体／気体／その他を、バッファ内のすべてのパターンと共有する!", "gui.gtceu.share_tank.title": "共有タンク在庫", "gui.widget.incrementButton.default_tooltip": "Shift、Ctrlまたはその両方で量を変更", - "gui.widget.recipeProgressWidget.default_tooltip": "レシピを表示", "item.glass_lens": "白いガラスレンズ", "item.gtceu.activity_detector_cover": "動作検出器", "item.gtceu.activity_detector_cover.tooltip": "§7レッドストーン信号として§f動作状態§7を検出する§fカバー§7", @@ -4163,11 +4155,11 @@ "item.gtceu.fullers_earth_dust": "フラー土の粉", "item.gtceu.garnet_sand_dust": "ガーネットサンド", "item.gtceu.gear_casting_mold": "金型 (歯車)", - "item.gtceu.gear_casting_mold.small.tooltip": "§7小さな歯車を作る為の金型", + "item.gtceu.small_gear_casting_mold.tooltip": "§7小さな歯車を作る為の金型", "item.gtceu.gear_casting_mold.tooltip": "§7歯車を作る為の金型", "item.gtceu.gear_extruder_mold": "押出形成用金型 (歯車)", "item.gtceu.gear_extruder_mold.tooltip": "§7歯車を作る為の押出形成用金型", - "item.gtceu.gear_small_extruder_mold.tooltip": "§7小さな歯車を作るための押出形成用金型", + "item.gtceu.small_gear_extruder_mold.tooltip": "§7小さな歯車を作るための押出形成用金型", "item.gtceu.gelled_toluene": "ゲル状トルエン", "item.gtceu.gelled_toluene.tooltip": "§7爆発物の原料", "item.gtceu.glass_gem": "ガラスクリスタル", @@ -4256,9 +4248,9 @@ "item.gtceu.item_filter": "アイテムフィルター", "item.gtceu.item_filter.tooltip.0": "§fアイテム§7の搬入出をフィルタリングする§fカバー§7。", "item.gtceu.item_filter.tooltip.1": "§fコンベアー§7と§fロボットアーム§7のアップグレードに。", - "item.gtceu.item_smart_filter": "スマートアイテムフィルター", - "item.gtceu.item_smart_filter.tooltip.0": "§fアイテム§7の搬入出を§f機械レシピ§7でフィルタリングする§fカバー§7。", - "item.gtceu.item_smart_filter.tooltip.1": "§fコンベアモジュール§7および§fロボットアーム§7のアップグレードに。", + "item.gtceu.smart_item_filter": "スマートアイテムフィルター", + "item.gtceu.smart_item_filter.tooltip.0": "§fアイテム§7の搬入出を§f機械レシピ§7でフィルタリングする§fカバー§7。", + "item.gtceu.smart_item_filter.tooltip.1": "§fコンベアモジュール§7および§fロボットアーム§7のアップグレードに。", "item.gtceu.item_tag_filter": "アイテムタグフィルター", "item.gtceu.item_tag_filter.tooltip.0": "§fアイテム§7の搬入出を§fアイテムタグ§7を使ってフィルタリングする§fカバー§7。", "item.gtceu.item_tag_filter.tooltip.1": "§fコンベアー§7と§fロボットアーム§7のアップグレードに。", @@ -4481,16 +4473,16 @@ "item.gtceu.pill_casting_mold": "金型 (錠剤)", "item.gtceu.pink_dye_spray_can": "桃色のスプレー缶", "item.gtceu.pink_glass_lens": "桃色のガラスレンズ", - "item.gtceu.pipe.huge_casting_mold.tooltip": "§7極太パイプを作るための金型", - "item.gtceu.pipe.huge_extruder_mold.tooltip": "§7極太パイプを作る為の押出形成用金型", - "item.gtceu.pipe.large_casting_mold.tooltip": "§7太いパイプを作るための金型", - "item.gtceu.pipe.large_extruder_mold.tooltip": "§7太いパイプを作る為の押出形成用金型", - "item.gtceu.pipe.normal_casting_mold.tooltip": "§7パイプを作るための金型", - "item.gtceu.pipe.normal_extruder_mold.tooltip": "§7パイプを作る為の押出形成用金型", - "item.gtceu.pipe.small_casting_mold.tooltip": "§7細いパイプを作るための金型", - "item.gtceu.pipe.small_extruder_mold.tooltip": "§7細いパイプを作る為の押出形成用金型", - "item.gtceu.pipe.tiny_casting_mold.tooltip": "§7極細パイプを作るための金型", - "item.gtceu.pipe.tiny_extruder_mold.tooltip": "§7極細パイプを作る為の押出形成用金型", + "item.gtceu.huge_pipe_casting_mold.tooltip": "§7極太パイプを作るための金型", + "item.gtceu.huge_pipe_extruder_mold.tooltip": "§7極太パイプを作る為の押出形成用金型", + "item.gtceu.large_pipe_casting_mold.tooltip": "§7太いパイプを作るための金型", + "item.gtceu.large_pipe_extruder_mold.tooltip": "§7太いパイプを作る為の押出形成用金型", + "item.gtceu.normal_pipe_casting_mold.tooltip": "§7パイプを作るための金型", + "item.gtceu.normal_pipe_extruder_mold.tooltip": "§7パイプを作る為の押出形成用金型", + "item.gtceu.small_pipe_casting_mold.tooltip": "§7細いパイプを作るための金型", + "item.gtceu.small_pipe_extruder_mold.tooltip": "§7細いパイプを作る為の押出形成用金型", + "item.gtceu.tiny_pipe_casting_mold.tooltip": "§7極細パイプを作るための金型", + "item.gtceu.tiny_pipe_extruder_mold.tooltip": "§7極細パイプを作る為の押出形成用金型", "item.gtceu.pitchblende_dust": "瀝青ウラン鉱", "item.gtceu.plant_ball": "プラントボール", "item.gtceu.plastic_circuit_board": "プラスチック製回路基板", @@ -4583,7 +4575,7 @@ "item.gtceu.rock_salt_dust": "岩塩", "item.gtceu.rod_extruder_mold": "押出形成用金型 (棒)", "item.gtceu.rod_extruder_mold.tooltip": "§7棒を作る為の押出形成用金型", - "item.gtceu.rod_long_extruder_mold.tooltip": "§7長い棒を作るための押出形成用金型", + "item.gtceu.long_rod_extruder_mold.tooltip": "§7長い棒を作るための押出形成用金型", "item.gtceu.rotor_casting_mold": "金型 (ローター)", "item.gtceu.rotor_casting_mold.tooltip": "§7ローターを作る為の金型", "item.gtceu.rotor_extruder_mold": "押出形成用金型 (ローター)", @@ -5192,7 +5184,7 @@ "material.gtceu.goethite": "針鉄鉱", "material.gtceu.gold": "金", "material.gtceu.granite": "花崗岩", - "material.gtceu.granite_red": "赤色花崗岩", + "material.gtceu.red_granite": "赤色花崗岩", "material.gtceu.granitic_mineral_sand": "花崗岩質含鉱砂", "material.gtceu.graphene": "グラフェン", "material.gtceu.graphite": "グラファイト", @@ -5362,9 +5354,9 @@ "material.gtceu.octane": "オクタン", "material.gtceu.oganesson": "オガネソン", "material.gtceu.oil": "原油", - "material.gtceu.oil_heavy": "重油", - "material.gtceu.oil_light": "軽油", - "material.gtceu.oil_medium": "原料油", + "material.gtceu.heavy_oil": "重油", + "material.gtceu.light_oil": "軽油", + "material.gtceu.raw_oil": "原料油", "material.gtceu.oilsands": "オイルサンド", "material.gtceu.olivine": "オリビン", "material.gtceu.opal": "オパール", @@ -5392,7 +5384,7 @@ "material.gtceu.platinum_group_sludge": "白金族泥の粉", "material.gtceu.platinum_raw": "生白金", "material.gtceu.platinum_sludge_residue": "白金泥残留物の粉", - "material.gtceu.plutonium": "プルトニウム", + "material.gtceu.plutonium_239": "プルトニウム239", "material.gtceu.plutonium_241": "プルトニウム241", "material.gtceu.pollucite": "ポルサイト", "material.gtceu.polonium": "ポロニウム", @@ -5575,7 +5567,7 @@ "material.gtceu.tungstic_acid": "タングステン酸", "material.gtceu.ultimet": "アルティメット", "material.gtceu.uraninite": "閃ウラン鉱", - "material.gtceu.uranium": "ウラン", + "material.gtceu.uranium_238": "ウラン238", "material.gtceu.uranium_235": "ウラン235", "material.gtceu.uranium_hexafluoride": "六フッ化ウラン", "material.gtceu.uranium_rhodium_dinaquadide": "ウラン-ロジウム 二ナクアダ物", @@ -5690,11 +5682,11 @@ "metaitem.machine_configuration.mode": "§a設定モード:§r %s", "metaitem.plugin.proxy.tooltips.1": "(スクリーンでプロキシモードに設定してください)", "metaitem.plugin.tooltips.1": "プラグインはスクリーンに挿入することで機能を追加します", - "metaitem.prospector.mode.bedrock_ore": "§b岩盤鉱石探査モード§r", - "metaitem.prospector.mode.fluid": "液体探知モード", - "metaitem.prospector.mode.ores": "鉱石探知モード", - "metaitem.prospector.tooltip.modes": "利用可能なモード:", - "metaitem.prospector.tooltip.radius": "半径%sチャンクの液体と鉱石をスキャン", + "behavior.prospector.mode.bedrock_ore": "§b岩盤鉱石探査モード§r", + "behavior.prospector.mode.fluid": "液体探知モード", + "behavior.prospector.mode.ores": "鉱石探知モード", + "behavior.prospector.tooltip.modes": "利用可能なモード:", + "behavior.prospector.tooltip.radius": "半径%sチャンクの液体と鉱石をスキャン", "metaitem.record.sus.tooltip": "Leonz - Among Us Drip", "metaitem.terminal.tooltip": "良い仕事をする賢い道具", "metaitem.terminal.tooltip.creative": "クリエイティブモード", @@ -5735,7 +5727,7 @@ "tagprefix.blackstone": "%s鉱石 (ブラックストーン)", "tagprefix.block": "%sブロック", "tagprefix.bolt": "%sのボルト", - "tagprefix.buzz_saw_blade": "%s製丸のこ刃", + "tagprefix.buzzsaw_blade": "%s製丸のこ刃", "tagprefix.cable_gt_double": "2倍%sケーブル", "tagprefix.cable_gt_hex": "16倍%sケーブル", "tagprefix.cable_gt_octal": "8倍%sケーブル", @@ -5833,13 +5825,5 @@ "tagprefix.wire_gt_octal": "8倍%sワイヤー", "tagprefix.wire_gt_quadruple": "4倍%sワイヤー", "tagprefix.wire_gt_single": "1倍%sワイヤー", - "tagprefix.wrench_tip": "%s製レンチの先端", - "tile.gtceu.brittle_charcoal.name": "脆い木炭", - "tile.gtceu.brittle_charcoal.tooltip.0": "炭窯で製造される。", - "tile.gtceu.brittle_charcoal.tooltip.1": "採掘すると木炭を得られる。", - "tile.gtceu.foam.name": "フォーム", - "tile.gtceu.petrified_foam.name": "石化したフォーム", - "tile.gtceu.reinforced_foam.name": "強化フォーム", - "tile.gtceu.reinforced_stone.name": "強化石材", - "tile.gtceu.seal.name": "密封されたブロック" + "tagprefix.wrench_tip": "%s製レンチの先端" } diff --git a/src/main/resources/assets/gtceu/lang/pt_br.json b/src/main/resources/assets/gtceu/lang/pt_br.json index 9c9d1301b85..75b2eede561 100644 --- a/src/main/resources/assets/gtceu/lang/pt_br.json +++ b/src/main/resources/assets/gtceu/lang/pt_br.json @@ -108,7 +108,7 @@ "behaviour.soft_hammer.disabled_cycle": "Funcionamento Desativado após o ciclo atual", "behaviour.soft_hammer.enabled": "Funcionamento Ativado", "behaviour.wrench": "Rotaciona Blocos com Clique Direito", - "block.filter_casing.tooltip": "Cria um ambiente §aLivre de Partículas§7", + "block.gtceu.filter_casing.tooltip": "Cria um ambiente §aLivre de Partículas§7", "block.gtceu.acid_hazard_sign_block": "Bloco de Sinal de Risco de Ácido", "block.gtceu.active_transformer": "Transformador Ativo", "block.gtceu.advanced_computer_casing": "Revestimento de Computador Avançado", @@ -812,7 +812,7 @@ "block.gtceu.me_pattern_buffer_proxy": "Proxy de Buffer de Padrões ME", "block.gtceu.me_stocking_input_bus": "Barramento de Entrada de Estoque ME", "block.gtceu.me_stocking_input_hatch": "Escotilha de Entrada de Estoque ME", - "block.gtceu.mega_blast_furnace": "Forno de Lareira Rotativa", + "block.gtceu.rotary_hearth_furnace": "Forno de Lareira Rotativa", "block.gtceu.mega_vacuum_freezer": "Resfriador de Explosão em Massa", "block.gtceu.miner_pipe": "Tubo de Minerador", "block.gtceu.mob_infestation_hazard_sign_block": "Bloco de Sinal de Risco de Infestação de Criaturas", @@ -1004,7 +1004,7 @@ "block.gtceu.orange_metal_sheet": "Chapa de Metal Laranja", "block.gtceu.orange_studs": "Pinos Laranjas", "block.gtceu.overworld_marker": "Mundo Superior", - "block.gtceu.palladium_substation": "Revestimento de Subestação de Paládio", + "block.gtceu.palladium_substation_casing": "Revestimento de Subestação de Paládio", "block.gtceu.pattern_buffer.desc.0": "§fPermite armazenamento direto de padrões §6AE2 §fpara Multiblocos GregTech.", "block.gtceu.pattern_buffer.desc.1": "§fPadrões AE2 podem utilizar qualquer coisa armazenada no widget de §6inventário compartilhado§f.", "block.gtceu.pattern_buffer.desc.2": "§fVincule §6Proxies de Buffer de Padrões §fcom um §bdatastick §fpara interligar máquinas!", @@ -1716,7 +1716,7 @@ "block.gtceu.zpm_transformer_4a": "Transformador de Alta Amperagem (4x) §cZPM Voltage§r", "block.gtceu.zpm_wiremill": "§cTrefiladora de Elite III§r", "block.gtceu.zpm_world_accelerator": "§cAcelerador de Mundo de Elite III§r", - "block.sterilizing_filter_casing.tooltip": "Cria um ambiente §aEsterilizado§7", + "block.gtceu.sterilizing_filter_casing.tooltip": "Cria um ambiente §aEsterilizado§7", "block.gtceu.surface_rock": "Rocha de Superfície de %s", "button.gtceu.mark_as_depleted.name": "Marcar como Esgotado", "button.gtceu.toggle_waypoint.name": "Alternar Waypoint", @@ -2095,7 +2095,6 @@ "cover.pump.mode.import": "Modo: Importar", "cover.pump.title": "Configurações da Cobertura de Bomba (%s)", "cover.pump.transfer_rate": "%s", - "cover.robotic_arm.title": "Configurações do Braço Robótico (%s)", "cover.robotic_arm.transfer_mode.description.0": "§eTransferir Qualquer§r - neste modo, a cobertura transferirá o máximo de itens que corresponderem ao seu filtro possível.", "cover.robotic_arm.transfer_mode.description.1": "§eFornecer Exato§r - neste modo, a cobertura fornecerá itens em porções especificadas nos slots de filtro de item (ou variável abaixo deste botão para filtro de tag). Se a quantidade de itens for menor que o tamanho da porção, os itens não serão movidos.", "cover.robotic_arm.transfer_mode.description.2": "§eManter Exato§r - neste modo, a cobertura manterá a quantidade especificada de itens no inventário de destino, fornecendo quantidade adicional de itens se necessário.", @@ -2192,8 +2191,6 @@ "enchantment.gtceu.disjunction.description": "Aplica Fraqueza e Lentidão a criaturas relacionadas ao Ender.", "enchantment.gtceu.hard_hammer.description": "Quebra blocos como se tivessem sido minerados com um Martelo GregTech.", "enchantment.hard_hammer": "Martelamento", - "entity.gtceu.boat": "Bote", - "entity.gtceu.chest_boat": "Bote com Baú", "entity.gtceu.dynamite": "Dinamite", "entity.gtceu.industrial_tnt": "TNT Industrial", "entity.gtceu.powderbarrel": "Barril de Pólvora", @@ -2203,19 +2200,19 @@ "fluid.tile.lava": "Lava", "fluid.tile.water": "Água", "fluid_cell.empty": "Vazio", - "gtceu.air_scrubber": "Purificador de Ar", - "gtceu.alloy_blast_smelter": "Fundição de Ligas de Alto-forno", - "gtceu.alloy_smelter": "Fundição de Ligas", - "gtceu.arc_furnace": "Forno a Arco", - "gtceu.assembler": "Montador", - "gtceu.assembly_line": "Linha de Montagem", + "recipe_type.gtceu.air_scrubber": "Purificador de Ar", + "recipe_type.gtceu.alloy_blast_smelter": "Fundição de Ligas de Alto-forno", + "recipe_type.gtceu.alloy_smelter": "Fundição de Ligas", + "recipe_type.gtceu.arc_furnace": "Forno a Arco", + "recipe_type.gtceu.assembler": "Montador", + "recipe_type.gtceu.assembly_line": "Linha de Montagem", "gtceu.auto_decomp.rotor": "Rotor de Turbina", "gtceu.auto_decomp.tool": "Ferramenta não elétrica", - "gtceu.autoclave": "Autoclave", + "recipe_type.gtceu.autoclave": "Autoclave", "gtceu.battery_buffer.average_input": "Entrada média: %s EU/t", "gtceu.battery_buffer.average_output": "Saída média: %s EU/t", - "gtceu.bender": "Dobrador", - "gtceu.brewery": "Cervejaria", + "recipe_type.gtceu.bender": "Dobrador", + "recipe_type.gtceu.brewery": "Cervejaria", "gtceu.bus.collapse.error": "O barramento deve ser anexado ao multibloco primeiro", "gtceu.bus.collapse_false": "O barramento não agrupará Itens", "gtceu.bus.collapse_true": "O barramento agrupará Itens", @@ -2227,7 +2224,7 @@ "gtceu.cable.loss_per_block": "§cPerda/Metro/Ampere:§r §c%d§7 EU-Volt", "gtceu.cable.superconductor": "Supercondutor de %s §d", "gtceu.cable.voltage": "§aVoltagem Máx:§r §a%d §a(%s§a)", - "gtceu.canner": "Enlatador", + "recipe_type.gtceu.canner": "Enlatador", "gtceu.central_monitor.gui.create_group": "Criar grupo", "gtceu.central_monitor.gui.currently_editing": "Editando atualmente: %s", "gtceu.central_monitor.gui.remove_from_group": "Remover do grupo", @@ -2242,19 +2239,19 @@ "gtceu.central_monitor.info_tooltip.7": "Coloque a cobertura no bloco alvo, clique com o botão direito nela com um bastão de dados e coloque esse bastão de dados em uma escotilha de acesso a dados no multibloco.", "gtceu.central_monitor.info_tooltip.8": "Em seguida, selecione a escotilha de acesso a dados como alvo e defina o índice do slot do seu bastão de dados no campo numérico que apareceu.", "gtceu.central_monitor.size": "Tamanho: (%d+1+%d)x(%d+1+%d)", - "gtceu.centrifuge": "Centrífuga", + "recipe_type.gtceu.centrifuge": "Centrífuga", "gtceu.chance_logic.and": "E", "gtceu.chance_logic.first": "PRIMEIRO", "gtceu.chance_logic.none": "NENHUM", "gtceu.chance_logic.or": "OU", "gtceu.chance_logic.xor": "XOR", "gtceu.chat.cape": "§5Parabéns: você acabou de desbloquear uma nova capa! Veja o aplicativo de terminal Seletor de Capas para usá-la.§r", - "gtceu.chemical_bath": "Banho Químico", - "gtceu.chemical_reactor": "Reator Químico", - "gtceu.circuit_assembler": "Montador de Circuitos", - "gtceu.coke_oven": "Forno de Coque", - "gtceu.combustion_generator": "Gerador a Combustão", - "gtceu.compressor": "Compressor", + "recipe_type.gtceu.chemical_bath": "Banho Químico", + "recipe_type.gtceu.chemical_reactor": "Reator Químico", + "recipe_type.gtceu.circuit_assembler": "Montador de Circuitos", + "recipe_type.gtceu.coke_oven": "Forno de Coque", + "recipe_type.gtceu.combustion_generator": "Gerador a Combustão", + "recipe_type.gtceu.compressor": "Compressor", "gtceu.computer_monitor_cover.error.bf_invalid": "Caractere inválido em %d", "gtceu.computer_monitor_cover.error.bf_invalid_num": "Número inválido no índice %d ao processar o número do símbolo %d", "gtceu.computer_monitor_cover.error.exception": "Ocorreu uma exceção inesperada: %s", @@ -2280,7 +2277,7 @@ "gtceu.cover.fluid_detector.message_fluid_storage_normal": "Monitorando Armazenamento de Fluido Normal", "gtceu.cover.item_detector.message_item_storage_inverted": "Monitorando Armazenamento de Item Invertido", "gtceu.cover.item_detector.message_item_storage_normal": "Monitorando Armazenamento de Item Normal", - "gtceu.cracker": "Craqueador", + "recipe_type.gtceu.cracker": "Craqueador", "gtceu.creative.activity.off": "Não ativo", "gtceu.creative.activity.on": "Ativo", "gtceu.creative.chest.ipc": "Itens por Ciclo", @@ -2297,7 +2294,7 @@ "gtceu.creative_tooltip.1": "§7Você só precisa do", "gtceu.creative_tooltip.2": " Modo Criativo", "gtceu.creative_tooltip.3": "§7 para usar isso", - "gtceu.cutter": "Cortador", + "recipe_type.gtceu.cutter": "Cortador", "gtceu.debug.f3_h.enabled": "GregTech modificou as informações de depuração! Para Desenvolvedores: ative a opção de configuração misc:debug no arquivo de configuração do GregTech para ver mais", "gtceu.debug.resource_rebuild.done": "Reconstrução de recursos do Gradle concluída em %s", "gtceu.debug.resource_rebuild.start": "Invocando reconstrução de recursos do Gradle (./gradlew :processResources)", @@ -2309,22 +2306,22 @@ "gtceu.direction.tooltip.up": "Acima", "gtceu.display_source.computer_monitor_cover": "Cobertura de Monitor de Computador", "gtceu.display_target.computer_monitor_cover": "Cobertura de Monitor de Computador", - "gtceu.distillation_tower": "Torre de Destilação", - "gtceu.distillery": "Destilaria", + "recipe_type.gtceu.distillation_tower": "Torre de Destilação", + "recipe_type.gtceu.distillery": "Destilaria", "gtceu.duct_pipe.transfer_rate": "§bTaxa de transferência de ar: %s", - "gtceu.dummy": "Manequim", - "gtceu.electric_blast_furnace": "Alto-forno Elétrico", - "gtceu.electric_furnace": "Forno Elétrico", - "gtceu.electrolyzer": "Eletrolisador", - "gtceu.electromagnetic_separator": "Separador Eletromagnético", + "recipe_type.gtceu.dummy": "Manequim", + "recipe_type.gtceu.electric_blast_furnace": "Alto-forno Elétrico", + "recipe_type.gtceu.electric_furnace": "Forno Elétrico", + "recipe_type.gtceu.electrolyzer": "Eletrolisador", + "recipe_type.gtceu.electromagnetic_separator": "Separador Eletromagnético", "gtceu.ender_item_link_cover.title": "Ligação de Item Ender", "gtceu.ender_item_link_cover.tooltip": "§7Transporta §fItens§7 com uma §fConexão §dEnder§f Sem Fio§7 como §fCobertura§7.", "gtceu.ender_redstone_link_cover.label": "Energia Redstone: %d", "gtceu.ender_redstone_link_cover.title": "Ligação de Redstone Ender", "gtceu.ender_redstone_link_cover.tooltip": "§7Transmite §fsinais de Redstone§7 com uma §fConexão §dEnder§f Sem Fio§7 como §fCobertura§7.", - "gtceu.extractor": "Extrator", - "gtceu.extruder": "Extrusora", - "gtceu.fermenter": "Fermentador", + "recipe_type.gtceu.extractor": "Extrator", + "recipe_type.gtceu.extruder": "Extrusora", + "recipe_type.gtceu.fermenter": "Fermentador", "gtceu.fluid.amount": "§9Quantidade: %d/%d mB", "gtceu.fluid.click_combined": "§7Clique com um Recipiente de Fluido para §cesvaziar §7ou §bencher §7o tanque (Shift-clique para um pack completo).", "gtceu.fluid.click_to_empty": "§7Clique com um Recipiente de Fluido para §cesvaziar §7o tanque (Shift-clique para um pack completo).", @@ -2342,7 +2339,7 @@ "gtceu.fluid.temperature": "§cTemperatura: %s", "gtceu.fluid.temperature.cryogenic": "§bCriogênico! Manuseie com cuidado!", "gtceu.fluid.type_acid.tooltip": "§6Ácido! Manuseie com cuidado!", - "gtceu.fluid_heater": "Aquecedor de Fluidos", + "recipe_type.gtceu.fluid_heater": "Aquecedor de Fluidos", "gtceu.fluid_pipe.acid_proof": "§6Pode lidar com Ácidos", "gtceu.fluid_pipe.capacity": "§9Capacidade: §f%d mB", "gtceu.fluid_pipe.channels": "§eCanais: §f%d", @@ -2351,15 +2348,15 @@ "gtceu.fluid_pipe.max_temperature": "§cLimite de Temperatura: §f%s", "gtceu.fluid_pipe.not_gas_proof": "§4Gases podem vazar!", "gtceu.fluid_pipe.plasma_proof": "§6Pode lidar com todos os Plasmas", - "gtceu.fluid_solidifier": "Solidificador de Fluidos", - "gtceu.forge_hammer": "Martelo de Forja", - "gtceu.forming_press": "Prensa de Moldagem", + "recipe_type.gtceu.fluid_solidifier": "Solidificador de Fluidos", + "recipe_type.gtceu.forge_hammer": "Martelo de Forja", + "recipe_type.gtceu.forming_press": "Prensa de Moldagem", "gtceu.forming_press.naming.named": "§oItem Nomeado", "gtceu.forming_press.naming.press": "§oPrensa Nomeada", "gtceu.forming_press.naming.to_name": "§oItem para Nomear", - "gtceu.fusion_reactor": "Reator de Fusão", - "gtceu.gas_collector": "Coletor de Gás", - "gtceu.gas_turbine": "Turbina a Gás", + "recipe_type.gtceu.fusion_reactor": "Reator de Fusão", + "recipe_type.gtceu.gas_collector": "Coletor de Gás", + "recipe_type.gtceu.gas_turbine": "Turbina a Gás", "gtceu.gui.adv_stocking_config.min_fluid_count": "Tamanho Mínimo do Pack de Fluido para Puxada Automática", "gtceu.gui.adv_stocking_config.min_item_count": "Tamanho Mínimo do Pack de Item para Puxada Automática", "gtceu.gui.adv_stocking_config.ticks_per_cycle": "Atraso entre atualizações da lista de itens", @@ -2498,7 +2495,7 @@ "gtceu.gui.toggle_view.disabled": "Alternar Visualização (Fluidos)", "gtceu.gui.toggle_view.enabled": "Alternar Visualização (Itens)", "gtceu.gui.waiting_list": "Fila de Envio:", - "gtceu.implosion_compressor": "Compressor de Implosão", + "recipe_type.gtceu.implosion_compressor": "Compressor de Implosão", "gtceu.io.both": "Ambos", "gtceu.io.export": "Exportar", "gtceu.io.import": "Importar", @@ -2509,7 +2506,7 @@ "gtceu.item_pipe.priority": "§9Prioridade: §f%d", "gtceu.jade.amperage_use": "%s A", "gtceu.jade.at": " @ ", - "gtceu.jade.changes_eu_sec": "%s EU/s", + "gtceu.jade.changes_eu_tick": "%s EU/t", "gtceu.jade.cleaned_this_second": "Risco limpo: %s/s", "gtceu.jade.days": "%s dias", "gtceu.jade.energy_stored": "%d / %d EU", @@ -2523,14 +2520,14 @@ "gtceu.jade.remaining_discharge_time": "Até esvaziar: %s", "gtceu.jade.seconds": "%s segundos", "gtceu.jade.years": "%s anos", - "gtceu.jei.bedrock_fluid.heavy_oil_deposit": "Depósito de Óleo Pesado", - "gtceu.jei.bedrock_fluid.lava_deposit": "Depósito de Lava", - "gtceu.jei.bedrock_fluid.light_oil_deposit": "Depósito de Óleo Leve", - "gtceu.jei.bedrock_fluid.natural_gas_deposit": "Depósito de Gás Natural", - "gtceu.jei.bedrock_fluid.nether_natural_gas_deposit": "Depósito de Gás Natural do Nether", - "gtceu.jei.bedrock_fluid.oil_deposit": "Depósito de Óleo", - "gtceu.jei.bedrock_fluid.raw_oil_deposit": "Depósito de Óleo Bruto", - "gtceu.jei.bedrock_fluid.salt_water_deposit": "Depósito de Água Salgada", + "bedrock_fluid.gtceu.heavy_oil_deposit": "Depósito de Óleo Pesado", + "bedrock_fluid.gtceu.lava_deposit": "Depósito de Lava", + "bedrock_fluid.gtceu.light_oil_deposit": "Depósito de Óleo Leve", + "bedrock_fluid.gtceu.natural_gas_deposit": "Depósito de Gás Natural", + "bedrock_fluid.gtceu.nether_natural_gas_deposit": "Depósito de Gás Natural do Nether", + "bedrock_fluid.gtceu.oil_deposit": "Depósito de Óleo", + "bedrock_fluid.gtceu.raw_oil_deposit": "Depósito de Óleo Bruto", + "bedrock_fluid.gtceu.salt_water_deposit": "Depósito de Água Salgada", "gtceu.jei.bedrock_fluid_diagram": "Diagrama de Fluido da Rocha-mãe", "gtceu.jei.bedrock_ore_diagram": "Diagrama de Minério da Rocha-mãe", "gtceu.jei.fluid.dep_amount_hover": "A quantidade pela qual o veio será esgotado", @@ -2565,46 +2562,46 @@ "gtceu.jei.ore.surface_rock.0": "Rochas de Superfície com este material denotam locais de geração de veios.", "gtceu.jei.ore.surface_rock.1": "Elas podem ser quebradas para obter 3 Pilhas Minúsculas do pó, com Fortuna dando um bônus.", "gtceu.jei.ore_processing_diagram": "Diagrama de Processamento de Minério", - "gtceu.jei.ore_vein.apatite_vein": "Veio de Apatita", - "gtceu.jei.ore_vein.banded_iron_vein": "Veio de Ferro Bandado", - "gtceu.jei.ore_vein.bauxite_vein_end": "Veio de Bauxita do End", - "gtceu.jei.ore_vein.beryllium_vein": "Veio de Berílio", - "gtceu.jei.ore_vein.cassiterite_vein": "Veio de Cassiterita", - "gtceu.jei.ore_vein.certus_quartz": "Quartzo de Certus", - "gtceu.jei.ore_vein.coal_vein": "Veio de Carvão", - "gtceu.jei.ore_vein.copper_tin_vein": "Veio de Cobre e Estanho", - "gtceu.jei.ore_vein.copper_vein": "Veio de Cobre", - "gtceu.jei.ore_vein.diamond_vein": "Veio de Diamante", - "gtceu.jei.ore_vein.galena_vein": "Veio de Galena", - "gtceu.jei.ore_vein.garnet_tin_vein": "Veio de Granada e Estanho", - "gtceu.jei.ore_vein.garnet_vein": "Veio de Granada", - "gtceu.jei.ore_vein.iron_vein": "Veio de Ferro", - "gtceu.jei.ore_vein.lapis_vein": "Veio de Lápis-lazúli", - "gtceu.jei.ore_vein.lubricant_vein": "Veio de Lubrificante", - "gtceu.jei.ore_vein.magnetite_vein_end": "Veio de Magnetita do End", - "gtceu.jei.ore_vein.magnetite_vein_ow": "Veio de Magnetita do Mundo Superior", - "gtceu.jei.ore_vein.manganese_vein": "Veio de Manganês", - "gtceu.jei.ore_vein.manganese_vein_ow": "Veio de Manganês do Mundo Superior", - "gtceu.jei.ore_vein.mica_vein": "Veio de Mica", - "gtceu.jei.ore_vein.mineral_sand_vein": "Veio de Areia Mineral", - "gtceu.jei.ore_vein.molybdenum_vein": "Veio de Molibdênio", - "gtceu.jei.ore_vein.monazite_vein": "Veio de Monazita", - "gtceu.jei.ore_vein.naquadah_vein": "Veio de Naquadah", - "gtceu.jei.ore_vein.nether_quartz_vein": "Veio de Quartzo do Nether", - "gtceu.jei.ore_vein.nickel_vein": "Veio de Níquel", - "gtceu.jei.ore_vein.oilsands_vein": "Veio de Areias Betuminosas", - "gtceu.jei.ore_vein.olivine_vein": "Veio de Olivina", - "gtceu.jei.ore_vein.pitchblende_vein_end": "Veio de Pechblenda do End", - "gtceu.jei.ore_vein.redstone_vein": "Veio de Redstone", - "gtceu.jei.ore_vein.redstone_vein_ow": "Veio de Redstone do Mundo Superior", - "gtceu.jei.ore_vein.saltpeter_vein": "Veio de Salitre", - "gtceu.jei.ore_vein.salts_vein": "Veio de Sais", - "gtceu.jei.ore_vein.sapphire_vein": "Veio de Safira", - "gtceu.jei.ore_vein.scheelite_vein": "Veio de Scheelita", - "gtceu.jei.ore_vein.sheldonite_vein": "Veio de Sheldonita", - "gtceu.jei.ore_vein.sulfur_vein": "Veio de Enxofre", - "gtceu.jei.ore_vein.tetrahedrite_vein": "Veio de Tetraedrita", - "gtceu.jei.ore_vein.topaz_vein": "Veio de Topázio", + "ore_vein.gtceu.apatite": "Apatita", + "ore_vein.gtceu.banded_iron": "Ferro Bandado", + "ore_vein.gtceu.end_bauxite": "Bauxita do End", + "ore_vein.gtceu.beryllium": "Berílio", + "ore_vein.gtceu.cassiterite": "Cassiterita", + "ore_vein.gtceu.certus_quartz": "Quartzo de Certus", + "ore_vein.gtceu.coal": "Carvão", + "ore_vein.gtceu.copper_tin": "Cobre e Estanho", + "ore_vein.gtceu.copper": "Cobre", + "ore_vein.gtceu.diamond": "Diamante", + "ore_vein.gtceu.galena": "Galena", + "ore_vein.gtceu.garnet_tin": "Granada e Estanho", + "ore_vein.gtceu.garnet": "Granada", + "ore_vein.gtceu.iron": "Ferro", + "ore_vein.gtceu.lapis": "Lápis-lazúli", + "ore_vein.gtceu.lubricant": "Lubrificante", + "ore_vein.gtceu.end_magnetite": "Magnetita do End", + "ore_vein.gtceu.magnetite": "Magnetita do Mundo Superior", + "ore_vein.gtceu.nether_manganese": "Manganês do Nether", + "ore_vein.gtceu.manganese": "Manganês do Mundo Superior", + "ore_vein.gtceu.mica": "Mica", + "ore_vein.gtceu.mineral_sand": "Areia Mineral", + "ore_vein.gtceu.molybdenum": "Molibdênio", + "ore_vein.gtceu.monazite": "Monazita", + "ore_vein.gtceu.naquadah": "Naquadah", + "ore_vein.gtceu.nether_quartz": "Quartzo do Nether", + "ore_vein.gtceu.nickel": "Níquel", + "ore_vein.gtceu.oilsands": "Areias Betuminosas", + "ore_vein.gtceu.olivine": "Olivina", + "ore_vein.gtceu.pitchblende": "Pechblenda", + "ore_vein.gtceu.nether_redstone": "Redstone do Nether", + "ore_vein.gtceu.redstone": "Redstone do Mundo Superior", + "ore_vein.gtceu.saltpeter": "Salitre", + "ore_vein.gtceu.salts": "Sais", + "ore_vein.gtceu.sapphire": "Safira", + "ore_vein.gtceu.scheelite": "Scheelita", + "ore_vein.gtceu.sheldonite": "Sheldonita", + "ore_vein.gtceu.sulfur": "Enxofre", + "ore_vein.gtceu.tetrahedrite": "Tetraedrita", + "ore_vein.gtceu.topaz": "Topázio", "gtceu.jei.ore_vein_diagram": "Diagrama de Veio de Minério", "gtceu.jei.ore_vein_diagram.chance": "§eChance: %s§r", "gtceu.jei.ore_vein_diagram.dimensions": "Dimensões:", @@ -2622,11 +2619,11 @@ "gtceu.key.enable_jetpack": "Ativar Jetpack", "gtceu.key.enable_step_assist": "Ativar Assistência de Degrau", "gtceu.key.tool_aoe_change": "Alternar Modo de Área de Efeito da Ferramenta", - "gtceu.large_boiler": "Caldeira Grande", - "gtceu.large_chemical_reactor": "Reator Químico Grande", - "gtceu.laser_engraver": "Gravador a Laser", - "gtceu.lathe": "Torno", - "gtceu.macerator": "Macerador", + "recipe_type.gtceu.large_boiler": "Caldeira Grande", + "recipe_type.gtceu.large_chemical_reactor": "Reator Químico Grande", + "recipe_type.gtceu.laser_engraver": "Gravador a Laser", + "recipe_type.gtceu.lathe": "Torno", + "recipe_type.gtceu.macerator": "Macerador", "gtceu.machine.active_transformer.tooltip.0": "§7Transformadores: Lasers Disfarçados", "gtceu.machine.active_transformer.tooltip.1": "§7Pode combinar qualquer número de §fEntradas§7 de Energia em qualquer número de §fSaídas§7 de Energia.", "gtceu.machine.active_transformer.tooltip.2": "§7Pode transmitir energia a distâncias incríveis com", @@ -2639,8 +2636,8 @@ "gtceu.machine.available_recipe_map_4.tooltip": "Tipos de Receita Disponíveis: %s, %s, %s, %s", "gtceu.machine.basic.input_from_output_side.allow": "Permitir Entrada pelo Lado de Saída: ", "gtceu.machine.basic.input_from_output_side.disallow": "Não Permitir Entrada pelo Lado de Saída: ", - "gtceu.machine.batch_disabled": "Agrupamento Desativado", - "gtceu.machine.batch_enabled": "Agrupamento Ativado", + "gtceu.machine.batching.disabled": "Agrupamento Desativado", + "gtceu.machine.batching.enabled": "Agrupamento Ativado", "gtceu.machine.bedrock_ore_miner.depletion": "§bTaxa de Esgotamento: §f%s%%", "gtceu.machine.bedrock_ore_miner.description": "§7Perfura minérios de veios sob a rocha-mãe.", "gtceu.machine.bedrock_ore_miner.production": "§eMultiplicador de Produção: §f%dx, %fx com overclock", @@ -3254,7 +3251,7 @@ "gtceu.maintenance.configurable_time.changed_description": "Problemas de manutenção ocorrerão a uma taxa de %fx do normal.", "gtceu.maintenance.configurable_time.unchanged_description": "Problemas de manutenção ocorrerão na taxa normal. Altere a configuração para atualizar.", "gtceu.minimap.ore_vein.depleted": "Esgotado", - "gtceu.mixer": "Misturador", + "recipe_type.gtceu.mixer": "Misturador", "gtceu.mode.both": "§dAmbos (Fluido E Item)§r", "gtceu.mode.fluid": "§9Fluido§r", "gtceu.mode.item": "§6Item§r", @@ -3501,11 +3498,11 @@ "gtceu.oc.tooltip.2": "Clique com o botão direito para diminuir o OC", "gtceu.oc.tooltip.3": "Clique com o botão do meio para redefinir o OC", "gtceu.oc.tooltip.4": "Segure Shift para alterar por OC Perfeito", - "gtceu.ore_washer": "Lavador de Minérios", + "recipe_type.gtceu.ore_washer": "Lavador de Minérios", "gtceu.ownership.name.argonauts": "Guilda dos Argonautas", "gtceu.ownership.name.ftb": "Equipes FTB", "gtceu.ownership.name.player": "Jogador", - "gtceu.packer": "Empacotador", + "recipe_type.gtceu.packer": "Empacotador", "gtceu.part_sharing.disabled": "Compartilhamento de Multibloco §4Desativado", "gtceu.part_sharing.enabled": "Compartilhamento de Multibloco §aAtivado", "gtceu.placeholder_info.active.0": "Retorna 1 se o bloco ao qual a cobertura está anexada estiver executando uma receita no momento, 0 caso contrário.", @@ -3727,20 +3724,20 @@ "gtceu.placeholder_info.voltage.0": "Retorna a voltagem no fio/cabo em que a cobertura está.", "gtceu.placeholder_info.voltage.1": "Uso:", "gtceu.placeholder_info.voltage.2": " {voltage} -> a voltagem no fio/cabo", - "gtceu.plasma_generator": "Gerador de Plasma", - "gtceu.polarizer": "Polarizador", - "gtceu.primitive_blast_furnace": "Alto-forno Primitivo", + "recipe_type.gtceu.plasma_generator": "Gerador de Plasma", + "recipe_type.gtceu.polarizer": "Polarizador", + "recipe_type.gtceu.primitive_blast_furnace": "Alto-forno Primitivo", "gtceu.provider.computer_monitor_cover.error.no_target": "Nenhum alvo selecionado para o grupo de monitores", - "gtceu.pyrolyse_oven": "Forno de Pirólise", + "recipe_type.gtceu.pyrolyse_oven": "Forno de Pirólise", "gtceu.recipe.byproduct_tier": "Subprodutos de %s§r+", - "gtceu.recipe.category.arc_furnace_recycling": "Sucateamento a Arco", - "gtceu.recipe.category.chem_dyes": "Tingimento Químico", - "gtceu.recipe.category.extractor_recycling": "Refusão de Sucata", - "gtceu.recipe.category.ingot_molding": "Moldagem de Metal", - "gtceu.recipe.category.macerator_recycling": "Moagem de Peças", - "gtceu.recipe.category.ore_bathing": "Tratamento de Minérios", - "gtceu.recipe.category.ore_crushing": "Moagem de Minérios", - "gtceu.recipe.category.ore_forging": "Trituração de Minérios", + "recipe_category.gtceu.arc_furnace_recycling": "Sucateamento a Arco", + "recipe_category.gtceu.chem_dyes": "Tingimento Químico", + "recipe_category.gtceu.extractor_recycling": "Refusão de Sucata", + "recipe_category.gtceu.ingot_molding": "Moldagem de Metal", + "recipe_category.gtceu.macerator_recycling": "Moagem de Peças", + "recipe_category.gtceu.ore_bathing": "Tratamento de Minérios", + "recipe_category.gtceu.ore_crushing": "Moagem de Minérios", + "recipe_category.gtceu.ore_forging": "Trituração de Minérios", "gtceu.recipe.chance": "Chance: %s +%s/nível", "gtceu.recipe.cleanroom": "Requer %s", "gtceu.recipe.cleanroom.display_name": "Sala Limpa", @@ -3781,15 +3778,15 @@ "gtceu.recipe_modifier.insufficient_voltage": "Nível de Voltagem Muito Baixo", "gtceu.recipe_type.show_recipes": "Mostrar Receitas", "gtceu.rei.group.potion_fluids": "Fluidos de Poção", - "gtceu.research_station": "Estação de Pesquisa", - "gtceu.rock_breaker": "Quebrador de Rochas", - "gtceu.scanner": "Escâner", + "recipe_type.gtceu.research_station": "Estação de Pesquisa", + "recipe_type.gtceu.rock_breaker": "Quebrador de Rochas", + "recipe_type.gtceu.scanner": "Escâner", "gtceu.scanner.copy_stick_empty": "§oBastão Vazio", "gtceu.scanner.copy_stick_from": "§oBastão para Copiar", "gtceu.scanner.copy_stick_to": "§oCópia do Bastão", - "gtceu.sifter": "Peneira", - "gtceu.steam_boiler": "Caldeira a Vapor", - "gtceu.steam_turbine": "Turbina a Vapor", + "recipe_type.gtceu.sifter": "Peneira", + "recipe_type.gtceu.steam_boiler": "Caldeira a Vapor", + "recipe_type.gtceu.steam_turbine": "Turbina a Vapor", "gtceu.subtitle.arc": "Arcos zumbindo", "gtceu.subtitle.assembler": "Montador construindo", "gtceu.subtitle.bath": "Banho efervescendo", @@ -3829,7 +3826,7 @@ "gtceu.subtitle.turbine": "Turbina zunindo", "gtceu.subtitle.wirecutter": "Fio cortado", "gtceu.subtitle.wrench": "Chave Inglesa chacoalhando", - "gtceu.thermal_centrifuge": "Centrífuga Térmica", + "recipe_type.gtceu.thermal_centrifuge": "Centrífuga Térmica", "gtceu.tool.class.axe": "Machado", "gtceu.tool.class.butchery_knife": "Faca de Açougueiro", "gtceu.tool.class.crowbar": "Pé de cabra", @@ -3982,8 +3979,8 @@ "gtceu.universal.tooltip.working_area_chunks": "§bÁrea de Trabalho: §f%dx%d Chunks", "gtceu.universal.tooltip.working_area_chunks_max": "§bÁrea de Trabalho Máx: §f%dx%d Chunks", "gtceu.universal.tooltip.working_area_max": "§bÁrea de Trabalho Máx: §f%dx%d", - "gtceu.vacuum_freezer": "Congelador a Vácuo", - "gtceu.wiremill": "Trefiladeira", + "recipe_type.gtceu.vacuum_freezer": "Congelador a Vácuo", + "recipe_type.gtceu.wiremill": "Trefiladeira", "gui.gtceu.refund_all.desc": "Devolver Conteúdos Armazenados para o AE2", "gui.gtceu.rename.desc": "Renomear Buffer de Padrão", "gui.gtceu.share_inventory.desc.0": "Compartilha itens inseridos com todos os padrões dentro do buffer!", @@ -3992,7 +3989,6 @@ "gui.gtceu.share_tank.desc.0": "Compartilha fluidos/gases/etc. inseridos com todos os padrões dentro do buffer!", "gui.gtceu.share_tank.title": "Inventário de Tanque Compartilhado", "gui.widget.incrementButton.default_tooltip": "Segure Shift, Ctrl ou ambos para alterar a quantidade", - "gui.widget.recipeProgressWidget.default_tooltip": "Mostrar Receitas", "item.glass_lens": "Lente de Vidro (Branca)", "item.gtceu.activity_detector_cover": "Detector de Atividade", "item.gtceu.activity_detector_cover.tooltip": "§7Emite §fStatus de Atividade§7 como Redstone como §fCobertura§7.", @@ -4240,11 +4236,11 @@ "item.gtceu.fullers_earth_dust": "Terra de Fuller", "item.gtceu.garnet_sand_dust": "Areia de Granada", "item.gtceu.gear_casting_mold": "Molde de Fundição (Engrenagem)", - "item.gtceu.gear_casting_mold.small.tooltip": "§7Molde para fazer Engrenagens pequenas", + "item.gtceu.small_gear_casting_mold.tooltip": "§7Molde para fazer Engrenagens pequenas", "item.gtceu.gear_casting_mold.tooltip": "§7Molde para fazer Engrenagens", "item.gtceu.gear_extruder_mold": "Molde de Extrusora (Engrenagem)", "item.gtceu.gear_extruder_mold.tooltip": "§7Formato de Extrusora para fazer Engrenagens", - "item.gtceu.gear_small_extruder_mold.tooltip": "§7Formato de Extrusora para fazer Engrenagens Pequenas", + "item.gtceu.small_gear_extruder_mold.tooltip": "§7Formato de Extrusora para fazer Engrenagens Pequenas", "item.gtceu.gelled_toluene": "Tolueno Geleificado", "item.gtceu.gelled_toluene.tooltip": "§7Explosivo Bruto", "item.gtceu.glass_gem": "Cristal de Vidro", @@ -4333,9 +4329,9 @@ "item.gtceu.item_filter": "Filtro de Itens", "item.gtceu.item_filter.tooltip.0": "§7Filtra a Entrada/Saída de §fItem§7 como §fCobertura§7.", "item.gtceu.item_filter.tooltip.1": "Pode ser usado como uma melhoria de §fMódulo de Esteira§7 e §fBraço Robótico§7.", - "item.gtceu.item_smart_filter": "Filtro Inteligente de Itens", - "item.gtceu.item_smart_filter.tooltip.0": "§7Filtra a Entrada/Saída de §fItem§7 com §fReceitas de Máquina§7 como §fCobertura§7.", - "item.gtceu.item_smart_filter.tooltip.1": "Pode ser usado como uma melhoria de §fMódulo de Esteira§7 e §fBraço Robótico§7.", + "item.gtceu.smart_item_filter": "Filtro Inteligente de Itens", + "item.gtceu.smart_item_filter.tooltip.0": "§7Filtra a Entrada/Saída de §fItem§7 com §fReceitas de Máquina§7 como §fCobertura§7.", + "item.gtceu.smart_item_filter.tooltip.1": "Pode ser usado como uma melhoria de §fMódulo de Esteira§7 e §fBraço Robótico§7.", "item.gtceu.item_tag_filter": "Filtro de Tag de Item", "item.gtceu.item_tag_filter.tooltip.0": "§7Filtra a Entrada/Saída de §fItem§7 com §fTags de Item§7 como §fCobertura§7.", "item.gtceu.item_tag_filter.tooltip.1": "Pode ser usado como uma melhoria de §fMódulo de Esteira§7 e §fBraço Robótico§7.", @@ -4558,16 +4554,16 @@ "item.gtceu.pill_casting_mold": "Molde de Fundição (Pílula)", "item.gtceu.pink_dye_spray_can": "Lata de Spray (Rosa)", "item.gtceu.pink_glass_lens": "Lente de Vidro (Rosa)", - "item.gtceu.pipe.huge_casting_mold.tooltip": "§7Molde para fazer Tubos de Bloco inteiro", - "item.gtceu.pipe.huge_extruder_mold.tooltip": "§7Formato de Extrusora para fazer Tubos de Bloco inteiro", - "item.gtceu.pipe.large_casting_mold.tooltip": "§7Molde para fazer Tubos grandes", - "item.gtceu.pipe.large_extruder_mold.tooltip": "§7Formato de Extrusora para fazer Tubos grandes", - "item.gtceu.pipe.normal_casting_mold.tooltip": "§7Molde para fazer Tubos", - "item.gtceu.pipe.normal_extruder_mold.tooltip": "§7Formato de Extrusora para fazer Tubos", - "item.gtceu.pipe.small_casting_mold.tooltip": "§7Molde para fazer Tubos pequenos", - "item.gtceu.pipe.small_extruder_mold.tooltip": "§7Formato de Extrusora para fazer Tubos pequenos", - "item.gtceu.pipe.tiny_casting_mold.tooltip": "§7Molde para fazer Tubos minúsculos", - "item.gtceu.pipe.tiny_extruder_mold.tooltip": "§7Formato de Extrusora para fazer Tubos minúsculos", + "item.gtceu.huge_pipe_casting_mold.tooltip": "§7Molde para fazer Tubos de Bloco inteiro", + "item.gtceu.huge_pipe_extruder_mold.tooltip": "§7Formato de Extrusora para fazer Tubos de Bloco inteiro", + "item.gtceu.large_pipe_casting_mold.tooltip": "§7Molde para fazer Tubos grandes", + "item.gtceu.large_pipe_extruder_mold.tooltip": "§7Formato de Extrusora para fazer Tubos grandes", + "item.gtceu.normal_pipe_casting_mold.tooltip": "§7Molde para fazer Tubos", + "item.gtceu.normal_pipe_extruder_mold.tooltip": "§7Formato de Extrusora para fazer Tubos", + "item.gtceu.small_pipe_casting_mold.tooltip": "§7Molde para fazer Tubos pequenos", + "item.gtceu.small_pipe_extruder_mold.tooltip": "§7Formato de Extrusora para fazer Tubos pequenos", + "item.gtceu.tiny_pipe_casting_mold.tooltip": "§7Molde para fazer Tubos minúsculos", + "item.gtceu.tiny_pipe_extruder_mold.tooltip": "§7Formato de Extrusora para fazer Tubos minúsculos", "item.gtceu.pitchblende_dust": "Pechblenda", "item.gtceu.plant_ball": "Bola de Planta", "item.gtceu.plastic_circuit_board": "Placa de Circuito de Plástico", @@ -4660,7 +4656,7 @@ "item.gtceu.rock_salt_dust": "Sal-gema", "item.gtceu.rod_extruder_mold": "Molde de Extrusora (Graveto)", "item.gtceu.rod_extruder_mold.tooltip": "§7Formato de Extrusora para fazer Gravetos", - "item.gtceu.rod_long_extruder_mold.tooltip": "§7Formato de Extrusora para fazer Gravetos Longos", + "item.gtceu.long_rod_extruder_mold.tooltip": "§7Formato de Extrusora para fazer Gravetos Longos", "item.gtceu.rotor_casting_mold": "Molde de Fundição (Rotor)", "item.gtceu.rotor_casting_mold.tooltip": "§7Molde para fazer Rotores", "item.gtceu.rotor_extruder_mold": "Molde de Extrusora (Rotor)", @@ -5273,7 +5269,7 @@ "material.gtceu.goethite": "Goethita", "material.gtceu.gold": "Ouro", "material.gtceu.granite": "Granito", - "material.gtceu.granite_red": "Granito Vermelho", + "material.gtceu.red_granite": "Granito Vermelho", "material.gtceu.granitic_mineral_sand": "Areia Mineral Granítica", "material.gtceu.graphene": "Grafeno", "material.gtceu.graphite": "Grafite", @@ -5443,9 +5439,9 @@ "material.gtceu.octane": "Octano", "material.gtceu.oganesson": "Oganessônio", "material.gtceu.oil": "Petróleo", - "material.gtceu.oil_heavy": "Petróleo Pesado", - "material.gtceu.oil_light": "Petróleo Leve", - "material.gtceu.oil_medium": "Petróleo Bruto", + "material.gtceu.heavy_oil": "Petróleo Pesado", + "material.gtceu.light_oil": "Petróleo Leve", + "material.gtceu.raw_oil": "Petróleo Bruto", "material.gtceu.oilsands": "Areias Betuminosas", "material.gtceu.olivine": "Olivina", "material.gtceu.opal": "Opala", @@ -5473,7 +5469,7 @@ "material.gtceu.platinum_group_sludge": "Lodo do Grupo da Platina", "material.gtceu.platinum_raw": "Platina Bruta", "material.gtceu.platinum_sludge_residue": "Resíduo de Lodo de Platina", - "material.gtceu.plutonium": "Plutônio", + "material.gtceu.plutonium_239": "Plutônio-239", "material.gtceu.plutonium_241": "Plutônio-241", "material.gtceu.pollucite": "Polucita", "material.gtceu.polonium": "Polônio", @@ -5657,7 +5653,7 @@ "material.gtceu.tungstic_acid": "Ácido Túngstico", "material.gtceu.ultimet": "Ultimet", "material.gtceu.uraninite": "Uraninita", - "material.gtceu.uranium": "Urânio", + "material.gtceu.uranium_238": "Urânio-238", "material.gtceu.uranium_235": "Urânio-235", "material.gtceu.uranium_hexafluoride": "Hexafluoreto de Urânio", "material.gtceu.uranium_rhodium_dinaquadide": "Dinaquadeto de Urânio Ródio", @@ -5795,11 +5791,11 @@ "metaitem.machine_configuration.mode": "§aModo de Configuração:§r %s", "metaitem.plugin.proxy.tooltips.1": "(Por favor, ajuste para o modo proxy na tela)", "metaitem.plugin.tooltips.1": "Plugins podem ser adicionados à tela para mais funcionalidades.", - "metaitem.prospector.mode.bedrock_ore": "§bModo de Prospecção de Minério de Rocha-mãe§r", - "metaitem.prospector.mode.fluid": "§bModo de Prospecção de Fluido§r", - "metaitem.prospector.mode.ores": "§aModo de Prospecção de Minério§r", - "metaitem.prospector.tooltip.modes": "Modos Disponíveis:", - "metaitem.prospector.tooltip.radius": "Escaneia o alcance em um Raio de %s Chunks", + "behavior.prospector.mode.bedrock_ore": "§bModo de Prospecção de Minério de Rocha-mãe§r", + "behavior.prospector.mode.fluid": "§bModo de Prospecção de Fluido§r", + "behavior.prospector.mode.ores": "§aModo de Prospecção de Minério§r", + "behavior.prospector.tooltip.modes": "Modos Disponíveis:", + "behavior.prospector.tooltip.radius": "Escaneia o alcance em um Raio de %s Chunks", "metaitem.record.sus.tooltip": "§7Leonz - Among Us Drip", "metaitem.terminal.tooltip": "Ferramentas afiadas fazem um bom trabalho", "metaitem.terminal.tooltip.creative": "§bModo Criativo", @@ -5854,7 +5850,7 @@ "tagprefix.blackstone": "Minério de %s de Pedra-negra", "tagprefix.block": "Bloco de %s", "tagprefix.bolt": "Parafuso de %s", - "tagprefix.buzz_saw_blade": "Lâmina de Serra Circular de %s", + "tagprefix.buzzsaw_blade": "Lâmina de Serra Circular de %s", "tagprefix.cable_gt_double": "Cabo de %s 2x", "tagprefix.cable_gt_hex": "Cabo de %s 16x", "tagprefix.cable_gt_octal": "Cabo de %s 8x", @@ -5953,14 +5949,6 @@ "tagprefix.wire_gt_quadruple": "Fio de %s 4x", "tagprefix.wire_gt_single": "Fio de %s 1x", "tagprefix.wrench_tip": "Ponta de Chave Inglesa de %s", - "tile.gtceu.brittle_charcoal.name": "Carvão Vegetal Quebradiço", - "tile.gtceu.brittle_charcoal.tooltip.0": "Produzido pelo Ignitor de Pilha de Carvão Vegetal.", - "tile.gtceu.brittle_charcoal.tooltip.1": "Minere isso para obter Carvão Vegetal.", - "tile.gtceu.foam.name": "Espuma", - "tile.gtceu.petrified_foam.name": "Espuma Petrificada", - "tile.gtceu.reinforced_foam.name": "Espuma Reforçada", - "tile.gtceu.reinforced_stone.name": "Pedra Reforçada", - "tile.gtceu.seal.name": "Bloco Selado", "tooltip.gtceu.antidote.description": "§aAntídoto §7Segure Shift para ver detalhes", "tooltip.gtceu.antidote.description.effect_removed": "Remove %s%% dos efeitos das condições atuais", "tooltip.gtceu.antidote.description.effect_removed.all": "Remove todos os efeitos das condições atuais", diff --git a/src/main/resources/assets/gtceu/lang/ru_ru.json b/src/main/resources/assets/gtceu/lang/ru_ru.json index d16f164d300..c8ab26c2045 100644 --- a/src/main/resources/assets/gtceu/lang/ru_ru.json +++ b/src/main/resources/assets/gtceu/lang/ru_ru.json @@ -10,23 +10,21 @@ "block.gtceu.luv_item_passthrough_hatch": "Предметный сквозной люк (§dLuV§r)", "cover.conveyor.mode.export": "Режим: Экспорт", "cover.conveyor.mode.import": "Режим: Импорт", - "gtceu.distillation_tower": "Ректификационная колонна", + "recipe_type.gtceu.distillation_tower": "Ректификационная колонна", "gtceu.jei.fluid.max_yield": "Максимальная Глубина: %d", - "gtceu.jei.ore_vein.nickel_vein": "Никелевая жила", - "gtceu.jei.ore_vein.salts_vein": "Солевая жила", - "gtceu.jei.ore_vein.sapphire_vein": "Сапфировая жила", - "gtceu.jei.ore_vein.scheelite_vein": "Шеелитовая жила", - "gtceu.jei.ore_vein.sheldonite_vein": "Шелдонитовая жила", - "gtceu.jei.ore_vein.sulfur_vein": "Серная жила", - "gtceu.jei.ore_vein.tetrahedrite_vein": "Тетрадеритовая жила", - "gtceu.jei.ore_vein.topaz_vein": "Топазовая жила", + "ore_vein.gtceu.nickel": "Никелевая", + "ore_vein.gtceu.salts": "Солевая", + "ore_vein.gtceu.sapphire": "Сапфировая", + "ore_vein.gtceu.scheelite": "Шеелитовая", + "ore_vein.gtceu.sheldonite": "Шелдонитовая", + "ore_vein.gtceu.sulfur": "Серная", + "ore_vein.gtceu.tetrahedrite": "Тетрадеритовая", + "ore_vein.gtceu.topaz": "Топазовая", "gtceu.jei.ore_vein_diagram": "Информация о рудных жилах", "gtceu.jei.ore_vein_diagram.chance": "§eШанс: %s§r", "gtceu.jei.ore_vein_diagram.dimensions": "Измерения:", "gtceu.jei.ore_vein_diagram.spawn_range": "Радиус:", "gtceu.jei.ore_vein_diagram.weight": "Объем: %s", - "gtceu.machine.miner.miney": "mY: %d", - "gtceu.machine.miner.minez": "mZ: %d", "gtceu.machine.miner.multi.description": "Многоблочная буровая установка, работающая на огромной площади и производящая огромное количество руды.", "gtceu.machine.miner.multi.modes": "Имеет режим шёлкового касания и выравнивания по чанкам.", "gtceu.machine.miner.multi.production": "Производит в §b3x§7 раза больше дробленой руды, чем измельчитель.", @@ -561,7 +559,7 @@ "block.gtceu.me_input_hatch": "ME жидкостный люк", "block.gtceu.me_output_bus": "ME Выходной предметный люк", "block.gtceu.me_output_hatch": "ME Выходной жидкостный люк", - "block.gtceu.mega_blast_furnace": "Карусельная печь", + "block.gtceu.rotary_hearth_furnace": "Карусельная печь", "block.gtceu.mega_vacuum_freezer": "Аппарат шоковой заморозки", "block.gtceu.miner_pipe": "Труба шахтера", "block.gtceu.molybdenum_disilicide_coil_block": "Катушка из дисилицида молибдена", @@ -706,7 +704,7 @@ "block.gtceu.opv_sifter": "§9§lСовершенный просеиватель §r", "block.gtceu.opv_thermal_centrifuge": "§9Совершенная термальная центрифуга §r", "block.gtceu.opv_wiremill": "§9§lСовершенный волочильный станок §r", - "block.gtceu.palladium_substation": "Палладиевый корпус подстанции", + "block.gtceu.palladium_substation_casing": "Палладиевый корпус подстанции", "block.gtceu.plascrete": "Пластбетон", "block.gtceu.plasma_large_turbine": "Большая плазменная турбина", "block.gtceu.power_substation": "Силовая подстанция", @@ -1236,7 +1234,6 @@ "block.gtceu.zpm_transformer_4a": "Высокотоковый трансформатор (4А §cZPM§r)", "block.gtceu.zpm_wiremill": "§cПревосходный волочильный станок III§r", "block.gtceu.surface_rock": "Поверхностная порода (%s)", - "config.gtceu.option.allUniqueStoneTypes": "allUniqueStoneTypes", "config.gtceu.option.bedrockOreDropTagPrefix": "bedrockOreDropTagPrefix", "config.gtceu.option.cleanMultiblocks": "cleanMultiblocks", "config.gtceu.option.client": "client", @@ -1423,7 +1420,6 @@ "cover.pump.mode.import": "Импорт", "cover.pump.title": "Настройки улучшения помпы (%s)", "cover.pump.transfer_rate": "%s мВ/сек.", - "cover.robotic_arm.title": "Настройки роб. манипулятора (%s)", "cover.robotic_arm.transfer_mode.description.0": "§eПеремещение любых предметов§r - в этом режиме улучшение будет передавать как можно больше предметов, соответствующих фильтру.", "cover.robotic_arm.transfer_mode.description.1": "§eПодавать точно§r - в этом режиме улучшение будет поставлять предметы порциями, указанными в слотах фильтра предметов (или скоростью передачи для §bФильтра тэгов§r). Если количество предметов меньше размера порции, предметы не будут перемещены.", "cover.robotic_arm.transfer_mode.description.2": "Сохранять точно§r - в этом режиме обложка сохранит указанное количество предметов в целевом инвентаре, предоставляя дополнительное количество предметов, если это необходимо.", @@ -1454,16 +1450,16 @@ "fluid.tile.lava": "Лава", "fluid.tile.water": "Вода", "fluid_cell.empty": "Пустая", - "gtceu.alloy_blast_smelter": "Доменная печь для сплавов", - "gtceu.alloy_smelter": "Печь для сплавов", - "gtceu.arc_furnace": "Дуговая печь", - "gtceu.assembler": "Сборщик", - "gtceu.assembly_line": "Сборочный конвейер", - "gtceu.autoclave": "Автоклав", + "recipe_type.gtceu.alloy_blast_smelter": "Доменная печь для сплавов", + "recipe_type.gtceu.alloy_smelter": "Печь для сплавов", + "recipe_type.gtceu.arc_furnace": "Дуговая печь", + "recipe_type.gtceu.assembler": "Сборщик", + "recipe_type.gtceu.assembly_line": "Сборочный конвейер", + "recipe_type.gtceu.autoclave": "Автоклав", "gtceu.battery_buffer.average_input": "Сред. ввод: %s EU/т", "gtceu.battery_buffer.average_output": "Сред. вывод: %s EU/т", - "gtceu.bender": "Гибочный станок", - "gtceu.brewery": "Варочная машина", + "recipe_type.gtceu.bender": "Гибочный станок", + "recipe_type.gtceu.brewery": "Варочная машина", "gtceu.bus.collapse.error": "Люк должен быть сперва добавлен в многоблочную структуру", "gtceu.bus.collapse_false": "Люк не будет совмещать Предметы", "gtceu.bus.collapse_true": "Люк будет совмещать Предметы", @@ -1471,40 +1467,15 @@ "gtceu.cable.loss_per_block": "§cПотеря за блок:§r §c%d§7 EU-Volt", "gtceu.cable.superconductor": "%s §dСверхпроводник", "gtceu.cable.voltage": "§aНапряжение:§r §a%d §a(%s§a)", - "gtceu.canner": "Наполнитель", - "gtceu.centrifuge": "Центрифуга", + "recipe_type.gtceu.canner": "Наполнитель", + "recipe_type.gtceu.centrifuge": "Центрифуга", "gtceu.chat.cape": "§5Поздравляю: вы только что разблокировали новый плащ! Откройте в терминале Переключатель плащей для подробной информации.§r", - "gtceu.chemical_bath": "Химическая ванна", - "gtceu.chemical_reactor": "Химический реактор", - "gtceu.circuit_assembler": "Сборщик микросхем", - "gtceu.coke_oven": "Коксовая печь", - "gtceu.combustion_generator": "Дизельный генератор", - "gtceu.command.copy.click_to_copy": "Нажмите для копирования", - "gtceu.command.copy.copied_and_click": "скопировано буфер обмена. Нажмите чтобы скопировать повторно", - "gtceu.command.copy.copied_end": "] в буфер обмена", - "gtceu.command.copy.copied_start": "Скопировано [", - "gtceu.command.hand.electric": "Информация о заряде: %d / %d Уровень напряжения: %d; Это батарея: %s", - "gtceu.command.hand.fluid": "Информация о жидкости: %d / %d мВ; Можно залить: %s; Можно слить: %s", - "gtceu.command.hand.fluid2": "ID жидкости:", - "gtceu.command.hand.groovy": "Рассмотрите возможность использования §6/gs hand", - "gtceu.command.hand.item_id": "Предмет: %s (Метаданные: %d)", - "gtceu.command.hand.material": "ID материала:", - "gtceu.command.hand.meta_item": "ID мета-предмета:", - "gtceu.command.hand.no_item": "Перед выполнением этой команды вы должны держать что-нибудь в руке.", - "gtceu.command.hand.not_a_player": "Эта команда может использоваться только игроком.", - "gtceu.command.hand.ore_prefix": "Префикс руды:", - "gtceu.command.hand.tool_stats": "Класс инструмента: %s", - "gtceu.command.hand.usage": "Используйте: /gtceu hand", - "gtceu.command.recipecheck.begin": "Запускаем проверку на конфликта рецептов...", - "gtceu.command.recipecheck.end": "Проверка конфликтов рецептов обнаружила %d возможных конфликтов. Проверьте записи сервера для получения дополнительной информации", - "gtceu.command.recipecheck.end_no_conflicts": "Конфликтов рецептов не обнаружено!", - "gtceu.command.recipecheck.usage": "Использование: /gtceu recipecheck", - "gtceu.command.usage": "Использование: /gtceu ", - "gtceu.command.worldgen.reload.failed": "Перезагрузка генератора мира окончилась ошибкой. Проверьте ошибки в консоли.", - "gtceu.command.worldgen.reload.success": "Генератор мира успешно перезагрузился из настроек.", - "gtceu.command.worldgen.reload.usage": "Использование: /gtceu worldgen reload", - "gtceu.command.worldgen.usage": "Использование: /gtceu worldgen ", - "gtceu.compressor": "Компрессор", + "recipe_type.gtceu.chemical_bath": "Химическая ванна", + "recipe_type.gtceu.chemical_reactor": "Химический реактор", + "recipe_type.gtceu.circuit_assembler": "Сборщик микросхем", + "recipe_type.gtceu.coke_oven": "Коксовая печь", + "recipe_type.gtceu.combustion_generator": "Дизельный генератор", + "recipe_type.gtceu.compressor": "Компрессор", "gtceu.cover.activity_detector.message_activity_inverted": "Следить за инвертированным состоянием активности", "gtceu.cover.activity_detector.message_activity_normal": "Следить за состоянием активности", "gtceu.cover.activity_detector_advanced.message_activity_inverted": "Следить за инвертированным состоянием прогресса", @@ -1515,7 +1486,7 @@ "gtceu.cover.fluid_detector.message_fluid_storage_normal": "Следить за заполнением резервуара", "gtceu.cover.item_detector.message_item_storage_inverted": "Следить за инвертированным заполнением хранилища", "gtceu.cover.item_detector.message_item_storage_normal": "Следить за заполнением хранилища", - "gtceu.cracker": "Крекинговый завод", + "recipe_type.gtceu.cracker": "Крекинговый завод", "gtceu.creative.activity.off": "Выключен", "gtceu.creative.activity.on": "Включен", "gtceu.creative.chest.ipc": "Предметов за цикл", @@ -1531,16 +1502,16 @@ "gtceu.creative_tooltip.1": "§7Вам нужен", "gtceu.creative_tooltip.2": " Творческий режим", "gtceu.creative_tooltip.3": "§7 чтобы использовать это", - "gtceu.cutter": "Резочная машина", + "recipe_type.gtceu.cutter": "Резочная машина", "gtceu.debug.f3_h.enabled": "GregTech изменил отладочную информацию! Для Разработчиков: включите параметр конфигурации misc:debug в файле конфигурации GregTech, чтобы увидеть больше", - "gtceu.distillery": "Дистиллятор", - "gtceu.electric_blast_furnace": "Электрическая доменная печь", - "gtceu.electric_furnace": "Электрическая печь", - "gtceu.electrolyzer": "Электролизер", - "gtceu.electromagnetic_separator": "Электромагнитный сепаратор", - "gtceu.extractor": "Экстрактор", - "gtceu.extruder": "Экструдер", - "gtceu.fermenter": "Ферментатор", + "recipe_type.gtceu.distillery": "Дистиллятор", + "recipe_type.gtceu.electric_blast_furnace": "Электрическая доменная печь", + "recipe_type.gtceu.electric_furnace": "Электрическая печь", + "recipe_type.gtceu.electrolyzer": "Электролизер", + "recipe_type.gtceu.electromagnetic_separator": "Электромагнитный сепаратор", + "recipe_type.gtceu.extractor": "Экстрактор", + "recipe_type.gtceu.extruder": "Экструдер", + "recipe_type.gtceu.fermenter": "Ферментатор", "gtceu.fluid.amount": "§9Количество: %d/%d мЛ", "gtceu.fluid.click_combined": "§7Нажмите с хранилищем для жидкости, чтобы §bзаполнить §7или §cопустошить §7резервуар.", "gtceu.fluid.click_to_empty": "§7Нажмите с хранилищем для жидкости, чтобы §bзаполнить §7или §cопустошить §7резервуар.", @@ -1558,7 +1529,7 @@ "gtceu.fluid.temperature": "§cТемпература: %d", "gtceu.fluid.temperature.cryogenic": "§bКриогенный! Соблюдайте осторожность!", "gtceu.fluid.type_acid.tooltip": "§6Кислота! Соблюдайте осторожность!", - "gtceu.fluid_heater": "Жидкостный нагреватель", + "recipe_type.gtceu.fluid_heater": "Жидкостный нагреватель", "gtceu.fluid_pipe.acid_proof": "§6Может хранить кислоты", "gtceu.fluid_pipe.capacity": "§9Вместимость: §f%d мВ", "gtceu.fluid_pipe.channels": "§eКаналов: §f%d", @@ -1567,12 +1538,12 @@ "gtceu.fluid_pipe.max_temperature": "§cМаксимальная температура: §f%s", "gtceu.fluid_pipe.not_gas_proof": "§4Возможна утечка газов!", "gtceu.fluid_pipe.plasma_proof": "§6Может хранить все виды Плазмы", - "gtceu.fluid_solidifier": "Жидкостный отвердитель", - "gtceu.forge_hammer": "Кузнечный молот", - "gtceu.forming_press": "Формовочный пресс", - "gtceu.fusion_reactor": "Термоядерный реактор", - "gtceu.gas_collector": "Воздухозаборник", - "gtceu.gas_turbine": "Газовая турбина", + "recipe_type.gtceu.fluid_solidifier": "Жидкостный отвердитель", + "recipe_type.gtceu.forge_hammer": "Кузнечный молот", + "recipe_type.gtceu.forming_press": "Формовочный пресс", + "recipe_type.gtceu.fusion_reactor": "Термоядерный реактор", + "recipe_type.gtceu.gas_collector": "Воздухозаборник", + "recipe_type.gtceu.gas_turbine": "Газовая турбина", "gtceu.gui.auto_output.name": "Автоматизация", "gtceu.gui.charger_slot.tooltip.0": "§fСлот двухстороннего питания§r", "gtceu.gui.charger_slot.tooltip.1": "§7Может потреблять энергию от %s §7аккумуляторов§r", @@ -1656,7 +1627,7 @@ "gtceu.gui.sort": "Сортировать", "gtceu.gui.toggle_view.disabled": "Переключить вид (Жидкости)", "gtceu.gui.toggle_view.enabled": "Переключить вид (Предметы)", - "gtceu.implosion_compressor": "Имплозионный компрессор", + "recipe_type.gtceu.implosion_compressor": "Имплозионный компрессор", "gtceu.io.both": "Оба", "gtceu.io.export": "Экспорт", "gtceu.io.import": "Импорт", @@ -1665,14 +1636,14 @@ "gtceu.item_filter.footer": "§eНажмите с предметом, чтобы переопределить", "gtceu.item_list.item_stored": "§7Хранится: %d", "gtceu.item_pipe.priority": "§9Приоритет: §f%d", - "gtceu.jei.bedrock_fluid.heavy_oil_deposit": "Залежь тяжелой нефти", - "gtceu.jei.bedrock_fluid.lava_deposit": "Залежь лавы", - "gtceu.jei.bedrock_fluid.light_oil_deposit": "Залежь легкой нефти", - "gtceu.jei.bedrock_fluid.natural_gas_deposit": "Залежь природного газа", - "gtceu.jei.bedrock_fluid.nether_natural_gas_deposit": "Залежь природного газа Нижнего мира", - "gtceu.jei.bedrock_fluid.oil_deposit": "Залежь нефть", - "gtceu.jei.bedrock_fluid.raw_oil_deposit": "Залежь сырой нефти", - "gtceu.jei.bedrock_fluid.salt_water_deposit": "Залежь соленой воды", + "bedrock_fluid.gtceu.heavy_oil_deposit": "Залежь тяжелой нефти", + "bedrock_fluid.gtceu.lava_deposit": "Залежь лавы", + "bedrock_fluid.gtceu.light_oil_deposit": "Залежь легкой нефти", + "bedrock_fluid.gtceu.natural_gas_deposit": "Залежь природного газа", + "bedrock_fluid.gtceu.nether_natural_gas_deposit": "Залежь природного газа Нижнего мира", + "bedrock_fluid.gtceu.oil_deposit": "Залежь нефть", + "bedrock_fluid.gtceu.raw_oil_deposit": "Залежь сырой нефти", + "bedrock_fluid.gtceu.salt_water_deposit": "Залежь соленой воды", "gtceu.jei.bedrock_fluid_diagram": "Информация о залежах", "gtceu.jei.fluid.dep_amount_hover": "Значение опустошения жилы", "gtceu.jei.fluid.dep_chance_hover": "Процентный шанс истощения жилы при добыче", @@ -1705,47 +1676,47 @@ "gtceu.jei.ore.surface_rock.0": "Поверхностные залежи с этим материалом обозначают места появления жил.", "gtceu.jei.ore.surface_rock.1": "Их можно разбить на 3 Крошечные кучки пыли, с Удачей мы получите дополнительные.", "gtceu.jei.ore_processing_diagram": "Схема обработки руды", - "gtceu.jei.ore_vein.apatite_vein": "Аратитовая жила", - "gtceu.jei.ore_vein.banded_iron_vein": "Полосчатого железа жила", - "gtceu.jei.ore_vein.bauxite_vein_end": "Бокситовая жила Края", - "gtceu.jei.ore_vein.beryllium_vein": "Бериллиевая жила", - "gtceu.jei.ore_vein.cassiterite_vein": "Касситеритовая жила", - "gtceu.jei.ore_vein.certus_quartz": "Истинный кварц", - "gtceu.jei.ore_vein.coal_vein": "Угольная жила", - "gtceu.jei.ore_vein.copper_tin_vein": "Медно-оловянная жила", - "gtceu.jei.ore_vein.copper_vein": "Медная жила", - "gtceu.jei.ore_vein.diamond_vein": "Алмазная жила", - "gtceu.jei.ore_vein.galena_vein": "Галеновая жила", - "gtceu.jei.ore_vein.garnet_tin_vein": "Оловяно-Гранатовая жила", - "gtceu.jei.ore_vein.garnet_vein": "Гранатовая жила", - "gtceu.jei.ore_vein.iron_vein": "Железная жила", - "gtceu.jei.ore_vein.lapis_vein": "Лазуритовая жила", - "gtceu.jei.ore_vein.lubricant_vein": "Жила лубрикантов", - "gtceu.jei.ore_vein.magnetite_vein_end": "Магнетитовая жила Края", - "gtceu.jei.ore_vein.magnetite_vein_ow": "Магнетитовая жила", - "gtceu.jei.ore_vein.manganese_vein": "Марганецевая жила", - "gtceu.jei.ore_vein.manganese_vein_ow": "Марганецевая жила", - "gtceu.jei.ore_vein.mica_vein": "Слюдовая жила", - "gtceu.jei.ore_vein.mineral_sand_vein": "Жила минерального песка", - "gtceu.jei.ore_vein.molybdenum_vein": "Молибденовая жила", - "gtceu.jei.ore_vein.monazite_vein": "Монацитовая жила", - "gtceu.jei.ore_vein.naquadah_vein": "Наквадная жила", - "gtceu.jei.ore_vein.nether_quartz_vein": "Жила незер-кварца", - "gtceu.jei.ore_vein.oilsands_vein": "Жила нефтеносного песка", - "gtceu.jei.ore_vein.olivine_vein": "Оливиновая жила", - "gtceu.jei.ore_vein.pitchblende_vein_end": "Уранитовая жила Края", - "gtceu.jei.ore_vein.redstone_vein": "Редстоуновая жила", - "gtceu.jei.ore_vein.redstone_vein_ow": "Редстоуновая жила", - "gtceu.jei.ore_vein.saltpeter_vein": "Селитровая жила", + "ore_vein.gtceu.apatite": "Аратитовая", + "ore_vein.gtceu.banded_iron": "Полосчатого железа", + "ore_vein.gtceu.end_bauxite": "Бокситовая Края", + "ore_vein.gtceu.beryllium": "Бериллиевая", + "ore_vein.gtceu.cassiterite": "Касситеритовая", + "ore_vein.gtceu.certus_quartz": "Истинный кварц", + "ore_vein.gtceu.coal": "Угольная", + "ore_vein.gtceu.copper_tin": "Медно-оловянная", + "ore_vein.gtceu.copper": "Медная", + "ore_vein.gtceu.diamond": "Алмазная", + "ore_vein.gtceu.galena": "Галеновая", + "ore_vein.gtceu.garnet_tin": "Оловяно-Гранатовая", + "ore_vein.gtceu.garnet": "Гранатовая", + "ore_vein.gtceu.iron": "Железная", + "ore_vein.gtceu.lapis": "Лазуритовая", + "ore_vein.gtceu.lubricant": "Жила лубрикантов", + "ore_vein.gtceu.end_magnetite": "Магнетитовая Края", + "ore_vein.gtceu.magnetite": "Магнетитовая", + "ore_vein.gtceu.nether_manganese": "Марганецевая", + "ore_vein.gtceu.manganese": "Марганецевая", + "ore_vein.gtceu.mica": "Слюдовая", + "ore_vein.gtceu.mineral_sand": "Жила минерального песка", + "ore_vein.gtceu.molybdenum": "Молибденовая", + "ore_vein.gtceu.monazite": "Монацитовая", + "ore_vein.gtceu.naquadah": "Наквадная", + "ore_vein.gtceu.nether_quartz": "Жила незер-кварца", + "ore_vein.gtceu.oilsands": "Жила нефтеносного песка", + "ore_vein.gtceu.olivine": "Оливиновая", + "ore_vein.gtceu.pitchblende": "Уранитовая Края", + "ore_vein.gtceu.nether_redstone": "Редстоуновая", + "ore_vein.gtceu.redstone": "Редстоуновая", + "ore_vein.gtceu.saltpeter": "Селитровая", "gtceu.key.armor_charging": "Заряжать инвентарь", "gtceu.key.armor_hover": "Режим парения", "gtceu.key.armor_mode_switch": "Переключить режим брони", "gtceu.key.tool_aoe_change": "Переключить режим АоЕ инструмента", - "gtceu.large_boiler": "Большой котел", - "gtceu.large_chemical_reactor": "Большой химический реактор", - "gtceu.laser_engraver": "Лазерный гравировщик", - "gtceu.lathe": "Токарный станок", - "gtceu.macerator": "Измельчитель", + "recipe_type.gtceu.large_boiler": "Большой котел", + "recipe_type.gtceu.large_chemical_reactor": "Большой химический реактор", + "recipe_type.gtceu.laser_engraver": "Лазерный гравировщик", + "recipe_type.gtceu.lathe": "Токарный станок", + "recipe_type.gtceu.macerator": "Измельчитель", "gtceu.machine.active_transformer.tooltip.0": "Трансформеры: Замаскированные лазеры", "gtceu.machine.active_transformer.tooltip.1": "Может комбинировать любое кол-во Энергетических §fВходных§7 разъемов в любое кол-во Энергетических §fВыходных§7 разъемов.", "gtceu.machine.active_transformer.tooltip.2": "Может передавать энергию на невероятное расстояние с помощью", @@ -1943,7 +1914,7 @@ "gtceu.maintenance.configurable_time": "Время: %fx", "gtceu.maintenance.configurable_time.changed_description": "Проблемы с обслуживанием будут возникать в %f раз чаще.", "gtceu.maintenance.configurable_time.unchanged_description": "Проблемы с обслуживанием будут возникать с обычной частотой. Измените конфигурацию для обновления.", - "gtceu.mixer": "Миксер", + "recipe_type.gtceu.mixer": "Миксер", "gtceu.muffler.recovery_tooltip": "§bШанс восстановления предмета: §f%d%%", "gtceu.multiblock.assembly_line.description": "Сборочная линия представляет собой большую многоблочную конструкцию, состоящую из 5-16 «кусочков». Теоретически это большая сборочная машина, используемая для создания продвинутых компонентов для крафта.", "gtceu.multiblock.blast_furnace.max_temperature": "Максимальная температура: %s", @@ -2105,15 +2076,15 @@ "gtceu.multiblock.validation_failed": "Неверное кол-во входов/выходов.", "gtceu.multiblock.waiting": "ВНИМАНИЕ: Машина ждет.", "gtceu.multiblock.work_paused": "Работа приостановлена.", - "gtceu.ore_washer": "Рудопромывочная машина", - "gtceu.packer": "Упаковщик", + "recipe_type.gtceu.ore_washer": "Рудопромывочная машина", + "recipe_type.gtceu.packer": "Упаковщик", "gtceu.part_sharing.disabled": "Совместное использование между структурами: §4Выключено", "gtceu.part_sharing.enabled": "Совместное использование между структурами: §aВключено", - "gtceu.plasma_generator": "Плазменный генератор", - "gtceu.polarizer": "Поляризатор", - "gtceu.primitive_blast_furnace": "Примитивная доменная печь", - "gtceu.pyrolyse_oven": "Пиролизная печь", - "gtceu.recipe.amperage": "Сила тока: %s", + "recipe_type.gtceu.plasma_generator": "Плазменный генератор", + "recipe_type.gtceu.polarizer": "Поляризатор", + "recipe_type.gtceu.primitive_blast_furnace": "Примитивная доменная печь", + "recipe_type.gtceu.pyrolyse_oven": "Пиролизная печь", + "recipe_type.gtceu.recipe.amperage": "Сила тока: %s", "gtceu.recipe.chance": "Шанс: %s +%s/уровень", "gtceu.recipe.cleanroom": "Требуется %s", "gtceu.recipe.cleanroom.display_name": "Чистая комната", @@ -2134,11 +2105,11 @@ "gtceu.recipe_memory_widget.tooltip.0": "§7Щелкните левой кнопкой мыши, чтобы автоматически добавить этот рецепт в сетку крафта", "gtceu.recipe_memory_widget.tooltip.1": "§7Нажмите Shift, чтобы заблокировать/разблокировать этот рецепт", "gtceu.recipe_type.show_recipes": "Показать рецепт", - "gtceu.rock_breaker": "Камнелом", - "gtceu.sifter": "Просеиватель", - "gtceu.steam_boiler": "Паровой котел", - "gtceu.steam_turbine": "Паровая турбина", - "gtceu.thermal_centrifuge": "Термальная центрифуга", + "recipe_type.gtceu.rock_breaker": "Камнелом", + "recipe_type.gtceu.sifter": "Просеиватель", + "recipe_type.gtceu.steam_boiler": "Паровой котел", + "recipe_type.gtceu.steam_turbine": "Паровая турбина", + "recipe_type.gtceu.thermal_centrifuge": "Термальная центрифуга", "gtceu.tool_action.crowbar": "§8Используйте Монтировку, чтобы снять улучшение", "gtceu.tool_action.hammer": "§8Используйте Кувалду, чтобы заглушить звук", "gtceu.tool_action.screwdriver.access_covers": "§8Используйте отвертку, чтобы настроить улучшения", @@ -2229,10 +2200,9 @@ "gtceu.universal.tooltip.working_area_chunks": "§bРабочая область: §f%dx%d Чанков", "gtceu.universal.tooltip.working_area_chunks_max": "§bМакс. рабочая область: §f%dx%d Чанков", "gtceu.universal.tooltip.working_area_max": "§bМакс. рабочая область: §f%dx%d", - "gtceu.vacuum_freezer": "Вакуумный холодильник", - "gtceu.wiremill": "Волочильный станок", + "recipe_type.gtceu.vacuum_freezer": "Вакуумный холодильник", + "recipe_type.gtceu.wiremill": "Волочильный станок", "gui.widget.incrementButton.default_tooltip": "Удерживайте Shift, Ctrl или оба, чтобы изменить кол-во", - "gui.widget.recipeProgressWidget.default_tooltip": "Показать рецепт", "item.gtceu.activity_detector_cover": "Детектор активности (Улучшение)", "item.gtceu.advanced_activity_detector_cover": "Улучшенный детектор активности (Улучшение)", "item.gtceu.advanced_energy_detector_cover": "Улучшенный детектор энергии (Улучшение)", @@ -2823,11 +2793,6 @@ "metaitem.liquid_fuel_jetpack.tooltip": "Использует топливо, от дизельного генератора, для тяги", "metaitem.plugin.proxy.tooltips.1": "(Пожалуйста, настройте режим прокси на экране)", "metaitem.plugin.tooltips.1": "Плагины могут быть добавлены на экран для большей функциональности.", - "metaitem.prospector.mode.bedrock_ore": "§bРежим разведки§r", - "metaitem.prospector.mode.fluid": "§bРежим разведки жидкости", - "metaitem.prospector.mode.ores": "§aРежим разведки руды", - "metaitem.prospector.tooltip.modes": "Возможные режимы:", - "metaitem.prospector.tooltip.radius": "Сканирует в радиусе %s чанка(ов)", "metaitem.record.sus.tooltip": "§7Leonz - Among Us Drip", "metaitem.terminal.tooltip": "Правильные инструменты делают хорошую работу", "metaitem.terminal.tooltip.creative": "§bТворческий режим", @@ -2859,7 +2824,7 @@ "tagprefix.basalt": "%s (Базальтовая руда)", "tagprefix.block": "%s (Блок)", "tagprefix.bolt": "%s (Болт)", - "tagprefix.buzz_saw_blade": "%s (Диск пилы)", + "tagprefix.buzzsaw_blade": "%s (Диск пилы)", "tagprefix.cable_gt_double": "2х кабель (%s)", "tagprefix.cable_gt_hex": "16х кабель (%s)", "tagprefix.cable_gt_octal": "8х кабель (%s)", @@ -2947,11 +2912,6 @@ "tagprefix.wrench_tip": "%s (Торцевая головка ключа)", "item.gtceu.diode": "Диод", "item.gtceu.mpic_chip": "PIC", - "tile.gtceu.foam.name": "Пена", - "tile.gtceu.petrified_foam.name": "Затвердевшая пена", - "tile.gtceu.reinforced_foam.name": "Армированная пена", - "tile.gtceu.reinforced_stone.name": "Армированный камень", - "tile.gtceu.seal.name": "Запечатанный блок", "block.gtceu.ev_input_hatch_4x": "Четверной входной люк (§5EV§r)", "block.gtceu.ev_output_hatch_4x": "Четверной выходной люк (§5EV§r)", "block.gtceu.ev_output_hatch_9x": "Девятерной выходной люк (§5EV§r)", @@ -3161,7 +3121,7 @@ "gtceu.machine.mv_replicator.tooltip": "§7Производство чистейших элементов", "gtceu.machine.mv_scanner.tooltip": "§7Сканирует материалов и не только", "gtceu.machine.mv_sifter.tooltip": "§7Сохраняйте спокойствие и продолжайте просеивать", - "block.filter_casing.tooltip": "Создает среду §aбез частиц§7", + "block.gtceu.filter_casing.tooltip": "Создает среду §aбез частиц§7", "block.gtceu.iv_input_hatch_4x": "Четверной входной люк (§9IV§r)", "block.gtceu.iv_input_hatch_9x": "Девятерной входной люк (§9IV§r)", "block.gtceu.iv_output_hatch_4x": "Четверной выходной люк (§9IV§r)", @@ -3184,7 +3144,7 @@ "block.gtceu.uhv_input_hatch_4x": "Четверной входной люк (§4UHV§r)", "block.gtceu.uiv_output_hatch_4x": "Четверной выходной люк (§2UIV§r)", "block.gtceu.uxv_output_hatch_4x": "Четверной выходной люк (§eUXV§r)", - "block.sterilizing_filter_casing.tooltip": "Создает §aстерилизованную§7 среду", + "block.gtceu.sterilizing_filter_casing.tooltip": "Создает §aстерилизованную§7 среду", "config.gtceu.option.rngDamageElectricTools": "rngDamageElectricTools", "gtceu.machine.ev_arc_furnace.tooltip": "§7Кому нужна доменная печь?", "gtceu.machine.ev_assembler.tooltip": "§7Мстители, общий сбор!", @@ -3411,22 +3371,22 @@ "item.gtceu.gear_extruder_mold.tooltip": "§7Форма экструдера для изготовления шестерней", "item.gtceu.hammer_extruder_mold.tooltip": "§7Форма экструдера для изготовления кувалд", "item.gtceu.hoe_extruder_mold.tooltip": "§7Форма экструдера для изготовления мотыг", - "item.gtceu.pipe.large_extruder_mold.tooltip": "§7Форма экструдера для изготовления больших труб", - "item.gtceu.pipe.normal_extruder_mold.tooltip": "§7Форма экструдера для изготовления труб", - "item.gtceu.pipe.small_extruder_mold.tooltip": "§7Форма экструдера для изготовления небольших труб", + "item.gtceu.large_pipe_extruder_mold.tooltip": "§7Форма экструдера для изготовления больших труб", + "item.gtceu.normal_pipe_extruder_mold.tooltip": "§7Форма экструдера для изготовления труб", + "item.gtceu.small_pipe_extruder_mold.tooltip": "§7Форма экструдера для изготовления небольших труб", "item.gtceu.plate_extruder_mold.tooltip": "§7Форма экструдера для изготовления пластин", - "item.gtceu.rod_long_extruder_mold.tooltip": "§7Форма экструдера для производства прутьев", + "item.gtceu.long_rod_extruder_mold.tooltip": "§7Форма экструдера для производства прутьев", "item.gtceu.rotor_extruder_mold.tooltip": "§7Форма экструдера для производства роторов", "item.gtceu.sword_extruder_mold.tooltip": "§7Форма экструдера для изготовления мечей", "item.gtceu.bottle_extruder_mold.tooltip": "§7Форма экструдера для изготовления бутылок", "item.gtceu.casing_extruder_mold.tooltip": "§7Форма экструдера для изготовления корпусов", "item.gtceu.file_extruder_mold.tooltip": "§7Форма экструдера для изготовления напильников", "item.gtceu.foil_extruder_mold.tooltip": "§7Форма экструдера для производства фольги из неметаллов", - "item.gtceu.gear_small_extruder_mold.tooltip": "§7Форма экструдера для изготовления маленьких шестерней", + "item.gtceu.small_gear_extruder_mold.tooltip": "§7Форма экструдера для изготовления маленьких шестерней", "item.gtceu.ingot_extruder_mold.tooltip": "§7Форма экструдера, подожди, может просто использовать печь?", "item.gtceu.pickaxe_extruder_mold.tooltip": "§7Форма экструдера для изготовления кирок", - "item.gtceu.pipe.huge_extruder_mold.tooltip": "§7Форма экструдера для изготовления огромных труб", - "item.gtceu.pipe.tiny_extruder_mold.tooltip": "§7Форма экструдера для изготовления очень маленьких труб", + "item.gtceu.huge_pipe_extruder_mold.tooltip": "§7Форма экструдера для изготовления огромных труб", + "item.gtceu.tiny_pipe_extruder_mold.tooltip": "§7Форма экструдера для изготовления очень маленьких труб", "item.gtceu.ring_extruder_mold.tooltip": "§7Форма экструдера для изготовления колец", "item.gtceu.rod_extruder_mold.tooltip": "§7Форма экструдера для изготовления стержней", "item.gtceu.saw_extruder_mold.tooltip": "§7Форма экструдера для изготовления пил", @@ -3458,7 +3418,7 @@ "item.gtceu.fluid_tag_filter.tooltip.0": "§7Фильтрует §fЖидкости§7 по §fТэгам жидкостей§7 как §fУлучшение механизма§7.", "item.gtceu.fluid_tag_filter.tooltip.1": "Может использоваться как улучшение §fПомпы§7 и §fРегулятора§7.", "item.gtceu.fluid_voiding_cover.tooltip.1": "Требуется активация с помощью §fКиянки§7 после установки.", - "item.gtceu.gear_casting_mold.small.tooltip": "§7Форма для изготовления маленьких шестерней", + "item.gtceu.small_gear_casting_mold.tooltip": "§7Форма для изготовления маленьких шестерней", "item.gtceu.gear_casting_mold.tooltip": "§7Форма для изготовления шестерней", "item.gtceu.good_electronic_circuit.tooltip.0": "§7Ваша вторая микросхема", "item.gtceu.good_electronic_circuit.tooltip.1": "§cMV Уровень", @@ -3699,7 +3659,7 @@ "material.gtceu.gallium_arsenide": "Арсенид галлия", "material.gtceu.gelatin_mixture": "Желатиновая смесь", "material.gtceu.glauconite_sand": "Глауконитовый песок", - "material.gtceu.granite_red": "Красный гранит", + "material.gtceu.red_granite": "Красный гранит", "material.gtceu.green_sapphire_slurry": "Шлам зелёного сапфира", "material.gtceu.hematite": "Гематит", "material.gtceu.hydro_cracked_butadiene": "Бутадиен прошедший крекинг водородом", @@ -3779,9 +3739,9 @@ "material.gtceu.octane": "Октан", "material.gtceu.oganesson": "Оганесон", "material.gtceu.oil": "Нефть", - "material.gtceu.oil_heavy": "Тяжелая нефть", - "material.gtceu.oil_light": "Легкая нефть", - "material.gtceu.oil_medium": "Средняя нефть", + "material.gtceu.heavy_oil": "Тяжелая нефть", + "material.gtceu.light_oil": "Легкая нефть", + "material.gtceu.raw_oil": "Средняя нефть", "material.gtceu.oilsands": "Нефтеносный песок", "material.gtceu.olivine": "Оливин", "material.gtceu.opal": "Опал", @@ -3801,7 +3761,7 @@ "material.gtceu.platinum_group_sludge": "Шлам платиновой группы", "material.gtceu.platinum_raw": "Необработанная платина", "material.gtceu.platinum_sludge_residue": "Остаток платинового шлама", - "material.gtceu.plutonium": "Плутоний", + "material.gtceu.plutonium_239": "Плутоний-239", "material.gtceu.plutonium_241": "Плутоний-241", "material.gtceu.pollucite": "Поллуцит", "material.gtceu.polonium": "Полоний", @@ -3965,7 +3925,7 @@ "material.gtceu.tungstic_acid": "Вольфрамовая кислота", "material.gtceu.ultimet": "Ультимет", "material.gtceu.uraninite": "Уранинит", - "material.gtceu.uranium": "Уран", + "material.gtceu.uranium_238": "Уран-238", "material.gtceu.uranium_235": "Уран-235", "material.gtceu.uranium_hexafluoride": "Гексафторид урана", "material.gtceu.uranium_rhodium_dinaquadide": "Уран родий динаквада", @@ -4477,8 +4437,6 @@ "behavior.portable_scanner.amp_per_sec": "За последняя секунду прошло %s A", "behavior.portable_scanner.energy_container_in": "Макс. вход: %s (%s) EU при %s A", "behavior.portable_scanner.multiblock_parallel": "Параллелей: %s", - "behavior.data_item.assemblyline.data": "- §a%s", - "behavior.data_item.assemblyline.title": "§nДанные для Сборочного конвейера:", "behavior.portable_scanner.debug_machine_invalid": " неверный!", "behavior.portable_scanner.debug_machine_valid": " верный", "behavior.portable_scanner.divider": "=========================", @@ -4547,8 +4505,6 @@ "death.attack.gtceu.drill_iv": "%s был засверлен 8192V дрелью %s", "death.attack.gtceu.drill_mv": "%s был засверлен 128V дрелью %s", "death.attack.gtceu.electric": "%s был шокирован", - "death.attack.gtceu.explosion": "%s взорвался", - "death.attack.gtceu.explosion.player": "%s взорвался при помощи %s", "death.attack.gtceu.file": "%s был шлифанут на смерть %s", "death.attack.gtceu.frost": "%s исследовал криогенику", "death.attack.gtceu.hammer": "%s был раздавлен %s", @@ -4685,8 +4641,8 @@ "gtceu.recipe.max_eu": "Макс. EU: %s EU", "gtceu.recipe.research": "Требует Исследование", "gtceu.recipe.scan_for_research": "Сканирование для Сборочной линии", - "gtceu.research_station": "Станция исследований", - "gtceu.scanner": "Сканер", + "recipe_type.gtceu.research_station": "Станция исследований", + "recipe_type.gtceu.scanner": "Сканер", "gtceu.top.progress_sec": " / %s сек", "gtceu.top.progress_tick": " / %s т", "gtceu.universal.kiloliters": "%s В", @@ -4945,7 +4901,6 @@ "block.gtceu.gray_borderless_lamp": "Серая лампа (Без границ)", "command.gtceu.medical_condition.get": "У игрока %s следующие заболевания:", "block.gtceu.the_nether_marker": "Нижний мир", - "block.gtceu.evaporation_plant": "Градирня", "material.gtceu.potassium_sulfate": "Сульфат калия", "behavior.portable_scanner.local_hazard": "Опасность в области: %s§r - %s ppm", "behavior.portable_scanner.local_hazard.nothing": "Опасность в области: §6Ничего§r", @@ -4961,11 +4916,8 @@ "material.gtceu.dichloroethane": "Дихлорэтан", "material.gtceu.diethylenetriamine": "Диэтилентриамин", "material.gtceu.diethylenetriaminepentaacetic_acid": "Диэтилентриаминпентауксусная кислота", - "material.gtceu.debrominated_brine": "Дебромированный соляной раствор", "material.gtceu.formamide": "Формамид", "material.gtceu.glycolonitrile": "Гликолонитрил", - "material.gtceu.hot_alkaline_debrominated_brine": "Горячий щелочной дебромированный соляной раствор", - "material.gtceu.hot_brine": "Горячий соляной раствор", "material.gtceu.paracetamol": "Парацетамол", "material.gtceu.potassium_cyanide": "Цианистый калий", "material.gtceu.potassium_ferrocyanide": "Ферроцианид калия", @@ -4975,7 +4927,6 @@ "death.attack.gtceu.medical_condition/poison": "%s забыл что яды ядовиты", "material.gtceu.acetic_anhydride": "Уксусный ангидрид", "material.gtceu.calcium_carbonate": "Карбонат кальция", - "material.gtceu.concentrated_bromine_solution": "Концентрированный раствор брома", "material.gtceu.formaldehyde": "Формальдегид", "material.gtceu.formic_acid": "Муравьиная кислота", "material.gtceu.aminophenol": "Аминофенол", @@ -5114,9 +5065,8 @@ "death.attack.gtceu.medical_condition/none": "%s умер от... ничего?", "death.attack.gtceu.medical_condition/silicosis": "%s умер не от туберкулёза. Это был Силикоз.", "death.attack.gtceu.medical_condition/weak_poison": "%s поел свинца (или ртути!)", - "gtceu.air_scrubber": "Очиститель воздуха", + "recipe_type.gtceu.air_scrubber": "Очиститель воздуха", "gtceu.duct_pipe.transfer_rate": "§bСкорость передачи воздуха: %s", - "gtceu.evaporation": "Выпаривание", "tooltip.gtceu.hazard_trigger.any": "При любом контакте", "tooltip.gtceu.hazard_trigger": "Проявляется при:", "tooltip.gtceu.hazard_trigger.inhalation": "Вдыхание вредных веществ", @@ -5140,7 +5090,6 @@ "config.gtceu.option.voltageTierQuarkTech": "voltageTierQuarkTech", "config.gtceu.option.zombieSpawnWithSabers": "zombieSpawnWithSabers", "config.gtceu.option.hideOreProcessingDiagrams": "hideOreProcessingDiagrams", - "block.gtceu.stainless_evaporation_casing": "Нержавеющий корпус градирни", "item.gtceu.battery.charge_detailed": "%s/%s EU§7 - Уровень %s §7(%s/%s %s осталось§7)", "item.gtceu.invar_lighter": "Инваровая зажигалка", "item.gtceu.matchbox": "Пачка спичек", @@ -5149,20 +5098,11 @@ "item.gtceu.nano_saber": "Нано-сабля", "item.gtceu.paracetamol_pill": "Таблетка парацетамола", "item.gtceu.pill_casting_mold": "Отливная форма (Таблетка)", - "material.gtceu.acidic_bromine_exhaust": "Кислотно-бромный выхлоп", - "material.gtceu.acidic_bromine_solution": "Кислотный раствор брома", "material.gtceu.ammonium_formate": "Формиат аммония", "tagprefix.blackstone": "%s (Чернитная руда)", - "tile.gtceu.brittle_charcoal.tooltip.1": "Добудь это что бы получить Древесный уголь.", - "tile.gtceu.brittle_charcoal.name": "Хрупкий древесный уголь", - "tile.gtceu.brittle_charcoal.tooltip.0": "Сделан с помощью воспламенителя угольной ямы.", - "material.gtceu.brominated_chlorine_vapor": "Бромированные пары хлора", - "material.gtceu.raw_brine": "Необработанный cоляной раствор", "item.gtceu.face_mask": "Медицинская маска", "item.gtceu.rad_away_pill": "Таблетка Антирадина", "item.gtceu.rubber_gloves": "Резиновые перчатки", - "material.gtceu.hot_chlorinated_brominated_brine": "Горячий хлорированный бромированный соляной раствор", - "material.gtceu.hot_debrominated_brine": "Горячий дебромированный соляной раствор", "block.gtceu.brown_large_metal_sheet": "Крупный коричневый лист металла", "block.gtceu.uev_transformer_16a": "Силовой трансформатор (§aUEV§r)", "block.gtceu.normal_optical_pipe.tooltip": "§7Передает данные §fИсследования§7 или §fВычислений§7", @@ -5322,8 +5262,7 @@ "block.gtceu.pattern_buffer.desc.0": "§fПозволяет прямое использование §66AE2 хранилища шаблонов§f в Gregtech структурах.", "block.gtceu.pattern_buffer_proxy.desc.2": "§fПусть фабрика растет!", "gtceu.jei.bedrock_ore_diagram": "Схема руды коренной породы", - "entity.gtceu.chest_boat": "Лодка с сундуком", - "gtceu.dummy": "Заглушка", + "recipe_type.gtceu.dummy": "Заглушка", "block.gtceu.pattern_buffer.desc.1": "§6Шаблоны AE2 могут использовать все что хранится в §6общих инвентарях§f.", "block.gtceu.pattern_buffer.desc.2": "§fСоедини §6Прокси-буфер МЭ Шаблонов§f с помощью §bФлешки§f с другими машинами!", "command.gtceu.dump_data.success": "Ресурсы %s скопированы из реестра %s в %s", @@ -5338,7 +5277,6 @@ "gtceu.multiblock.active_transformer.max_input": "§аМакс. ввод: §f%s EU/т", "gtceu.multiblock.active_transformer.max_output": "§аМакс. вывод: §f%s EU/т", "gui.gtceu.refund_all.desc": "Вернуть хранимое содержимое в AE2", - "entity.gtceu.boat": "Лодка", "gtceu.multiblock.exact_hatch_1.tooltip": "§fПринимает только §6Один§f Энергетический разьем.", "gtceu.multiblock.universal.rotor_obstructed": "Ротор заблокирован!", "gtceu.tooltip.proxy_bind": "§fПривязка Буфера Шаблонов к %s %s %s", @@ -5358,7 +5296,6 @@ "item.gtceu.treated_wood_chest_boat": "Обработанная деревянная лодка с сундуком", "material.gtceu.echo_shard": "Осколок эха", "material.gtceu.sculk": "Скалк", - "material.gtceu.hydrogen_iodide": "Йодид водорода", "metaarmor.nms.boosted_jump.enabled": "NanoMuscle™ Suite: Прыгучесть включена", "recipe.condition.adjacent_block.tooltip": "Блоки вокруг", "metaarmor.nms.boosted_jump.disabled": "NanoMuscle™ Suite: Прыгучесть выключена", @@ -5402,7 +5339,6 @@ "config.gtceu.option.oreScaleStop": "oreScaleStop", "config.gtceu.option.yOffset": "yOffset", "gtceu.journeymap.options.layers.ore_veins": "Показать рудные жилы", - "message.gtceu.new_veins": "Обнаружено %d новых жил!", "config.gtceu.option.xOffset": "xOffset", "config.gtceu.option.borderColor": "borderColor", "config.gtceu.option.buttonAnchor": "buttonAnchor", @@ -5423,18 +5359,17 @@ "gtceu.machine.boiler.info.cooling.down": "§9Охлаждение§r", "gtceu.machine.boiler.info.heating.up": "§cНагрев§r", "gtceu.machine.boiler.info.producing.steam": " §a(кипящей воды)", - "gtceu.recipe.category.arc_furnace_recycling": "Дуговая утилизация", - "gtceu.recipe.category.chem_dyes": "Хим. покраска", - "gtceu.recipe.category.extractor_recycling": "Утилизация экстрактором", - "gtceu.recipe.category.ingot_molding": "Отливка металлов", - "gtceu.recipe.category.macerator_recycling": "Утилизация измельчителем", - "gtceu.recipe.category.ore_bathing": "Обработка руды", - "gtceu.recipe.category.ore_crushing": "Измельчение руды", - "gtceu.recipe.category.ore_forging": "Дробление руды", - "item.gtceu.item_smart_filter": "Умный предметный фильтр", + "recipe_category.gtceu.arc_furnace_recycling": "Дуговая утилизация", + "recipe_category.gtceu.chem_dyes": "Хим. покраска", + "recipe_category.gtceu.extractor_recycling": "Утилизация экстрактором", + "recipe_category.gtceu.ingot_molding": "Отливка металлов", + "recipe_category.gtceu.macerator_recycling": "Утилизация измельчителем", + "recipe_category.gtceu.ore_bathing": "Обработка руды", + "recipe_category.gtceu.ore_crushing": "Измельчение руды", + "recipe_category.gtceu.ore_forging": "Дробление руды", + "item.gtceu.smart_item_filter": "Умный предметный фильтр", "item.gtceu.tool.mallet.tooltip.1": "§8Останавливает/Запускает механизм", "item.gtceu.tool.tooltip.max_uses": "%s §eОбщая прочность", - "behaviour.soft_hammer.idle_after_cycle": "Остановить машину после текущего цикла", "block.gtceu.iv_fisher": "§9Превосходный рыболов §r", "config.gtceu.option.enableFEConverters": "enableFEConverters", "config.gtceu.option.euToFeRatio": "euToFeRatio", @@ -5445,10 +5380,9 @@ "config.gtceu.option.hideFacadesInRecipeViewer": "hideFacadesInRecipeViewer", "config.gtceu.option.nativeEUToFE": "nativeEUToFE", "cover.item_smart_filter.filtering_mode.description.0": "Выберите машину, которую этот Умный фильтр будет использовать для фильтрации.", - "gtceu.command.hand.tag_entries": "§3Тэги:", "gtceu.button.bedrock_fluids": "Показать залежи жидкостей в коренной породе", - "item.gtceu.item_smart_filter.tooltip.0": "§7Фильтрует §fПредметы§7 на основе §fРецептов машин§7 как §fУлучшение механизма§7.", - "item.gtceu.item_smart_filter.tooltip.1": "Может использоваться как улучшение §fКонвейера§7 и §fРобот. манипулятора§7.", + "item.gtceu.smart_item_filter.tooltip.0": "§7Фильтрует §fПредметы§7 на основе §fРецептов машин§7 как §fУлучшение механизма§7.", + "item.gtceu.smart_item_filter.tooltip.1": "Может использоваться как улучшение §fКонвейера§7 и §fРобот. манипулятора§7.", "config.jade.plugin_gtceu.steam_boiler_info": "[GTCEu] Паровой котел", "cover.item_smart_filter.filtering_mode.description.1": "Он автоматически отберет нужное кол-во предметов для роб. манипулятора.", "cover.item_smart_filter.filtering_mode.electrolyzer": "Электролизер", @@ -5570,8 +5504,6 @@ "gtceu.gui.content.chance_no_boost": "Шанс: %s%%", "gtceu.gui.content.chance_no_boost_logic": "Шанс: %s%% (%s)", "gtceu.gui.content.fluid_range": "%s-%sмВ", - "gtceu.machine.batch_disabled": "Группирование выключено", - "gtceu.machine.batch_enabled": "Группирование включено", "gtceu.multiblock.batch_enabled": "- %dx из Группирования", "gtceu.recipe.eu.total": "%s EU/т", "gtceu.recipe.total_eu": "Общее исп.: %s EU/т", @@ -5665,6 +5597,7 @@ "gtceu.placeholder_info.ae2energy.1": "Используется:", "config.gtceu.option.arcRecyclingYield": "arcRecyclingYield", "behavior.data_item.data": "- §a%s", + "behavior.data_item.title": "§nДанные о строительстве %s:", "config.gtceu.option.enableArcRecycling": "enableArcRecycling", "config.gtceu.option.maceratorRecyclingYield": "maceratorRecyclingYield", "config.gtceu.option.enableExtractorRecycling": "enableExtractorRecycling", @@ -5689,7 +5622,6 @@ "gtceu.placeholder_info.ae2fluidCount.3": " {fluidCount [fluidId]} -> возвращает общее количество всех жидкостей или количество жидкости с указанным fluidId, если оно задано", "gtceu.placeholder_info.ae2itemCount.0": "Так же, как и itemCount, но подсчитывает предметы в сети МЭ, к которой подключен блок на котором установлено это улучшение.", "gtceu.placeholder_info.ae2itemCount.1": "Обратите внимание, что подсчёт по фильтру или всех предметов может привести к лагам!", - "behavior.data_item.title": "§nДанные о строительстве %s:", "cover.machine_controller.suspend_powerfail": "Предотвращение отключения питания:", "gtceu.placeholder_info.ae2powerUsage.2": " {ae2powerUsage} -> возвращает энергопотребление МЭ сети", "block.gtceu.bronze_tank_valve": "Клапан бронзового резервуара", @@ -5741,7 +5673,6 @@ "gtceu.placeholder_info.data.1": "Если оставить аргумент пустым, он будет заменён на значение p (где p — целое число от 0 до (вместимость - 1), которое хранится в NBT-данных элемента).", "gtceu.placeholder_info.data.2": "Используется:", "config.gtceu.option.maintenanceCheckRate": "maintenanceCheckRate", - "config.gtceu.option.allowDrumsInputFluidsFromOutputSide": "allowDrumsInputFluidsFromOutputSide", "config.gtceu.option.renderGrowingPlants": "renderGrowingPlants", "gtceu.placeholder_info.data.3": "{data get <слот> <индекс>} -> возвращает данные, хранящиеся в предмете в указанном слоте", "gtceu.placeholder_info.data.4": " {data set <слот> <индекс> <значение>} — задаёт данные, хранящиеся в элементе указанного слота, возвращает пустую строку.", @@ -5873,11 +5804,11 @@ "item.gtceu.image_module": "Модуль изображения", "item.gtceu.large_pipe_casting_mold": "Отливная форма (Большая труба)", "item.gtceu.normal_pipe_casting_mold": "Отливная форма (Обычная труба)", - "item.gtceu.pipe.huge_casting_mold.tooltip": "§7Форма для отливки огромных труб", - "item.gtceu.pipe.large_casting_mold.tooltip": "§7Форма для отливки больших труб", - "item.gtceu.pipe.normal_casting_mold.tooltip": "§7Форма для отливки труб", - "item.gtceu.pipe.small_casting_mold.tooltip": "§7Форма для отливки небольших труб", - "item.gtceu.pipe.tiny_casting_mold.tooltip": "§7Форма для отливки очень маленьких труб", + "item.gtceu.huge_pipe_casting_mold.tooltip": "§7Форма для отливки огромных труб", + "item.gtceu.large_pipe_casting_mold.tooltip": "§7Форма для отливки больших труб", + "item.gtceu.normal_pipe_casting_mold.tooltip": "§7Форма для отливки труб", + "item.gtceu.small_pipe_casting_mold.tooltip": "§7Форма для отливки небольших труб", + "item.gtceu.tiny_pipe_casting_mold.tooltip": "§7Форма для отливки очень маленьких труб", "item.gtceu.small_pipe_casting_mold": "Отливная форма (Малая труба)", "item.gtceu.text_module": "Текстовый модуль", "item.gtceu.tiny_pipe_casting_mold": "Отливная форма (Очень малая труба)", @@ -5940,7 +5871,6 @@ "gtceu.gui.item_voiding": "§7Удаление §6предметов", "gtceu.gui.multiblock.voiding_mode": "Режим удаления:", "gtceu.gui.no_voiding": "§7Не назначено", - "gtceu.jade.changes_eu_sec": "%s EU/сек", "gtceu.jade.days": "%s Дней(я)", "gtceu.jade.years": "%s Лет", "gtceu.jade.seconds": "%s Секунд(ы)", diff --git a/src/main/resources/assets/gtceu/lang/uk_ua.json b/src/main/resources/assets/gtceu/lang/uk_ua.json index 02757d927b0..f29ce9cdf15 100644 --- a/src/main/resources/assets/gtceu/lang/uk_ua.json +++ b/src/main/resources/assets/gtceu/lang/uk_ua.json @@ -116,7 +116,7 @@ "behaviour.soft_hammer.enabled": "Робота відновлена", "behaviour.soft_hammer.ignored": "Машина не може бути зупинена", "behaviour.wrench": "Повертає блоки клацанням ПКМ", - "block.filter_casing.tooltip": "Створює§a вільне від частинок§7 середовище", + "block.gtceu.filter_casing.tooltip": "Створює§a вільне від частинок§7 середовище", "block.gtceu.acid_hazard_sign_block": "Блок зі знаком кислотної небезпеки", "block.gtceu.active_transformer": "Активний трансформатор", "block.gtceu.advanced_computer_casing": "Вдосконалений комп’ютерний корпус", @@ -821,7 +821,7 @@ "block.gtceu.me_pattern_buffer_proxy": "Проксі ME шаблонного буфера", "block.gtceu.me_stocking_input_bus": "МЕ Складальна вхідна шина", "block.gtceu.me_stocking_input_hatch": "МЕ Складальний ввідний люк", - "block.gtceu.mega_blast_furnace": "Ротаційна мартенівська піч", + "block.gtceu.rotary_hearth_furnace": "Ротаційна мартенівська піч", "block.gtceu.mega_vacuum_freezer": "Масовий шоковий охолоджувач", "block.gtceu.miner_pipe": "Бурова труба", "block.gtceu.mob_infestation_hazard_sign_block": "Блок зі знаком небезпеки зараження мобів", @@ -1013,7 +1013,7 @@ "block.gtceu.orange_metal_sheet": "Помаранчеве металеве покриття", "block.gtceu.orange_studs": "Помаранчеві кубики", "block.gtceu.overworld_marker": "Верхній світ", - "block.gtceu.palladium_substation": "Паладієвий корпус підстанції", + "block.gtceu.palladium_substation_casing": "Паладієвий корпус підстанції", "block.gtceu.pattern_buffer.desc.0": "§fДозволяє безпосередньо§6 зберігати шаблони AE2§f для конструкцій GregTech.", "block.gtceu.pattern_buffer.desc.1": "§fШаблони AE2 можуть використовувати все, що зберігається у віджеті§6 спільного містила§f.", "block.gtceu.pattern_buffer.desc.2": "§fЗ’єднайте§6 проксі шаблонних буферів§f з§b карткою даних§f, щоб зв’язати машини між собою!", @@ -1726,7 +1726,7 @@ "block.gtceu.zpm_transformer_4a": "§cZPM-напруга§r Трансформатор високого струму (4x)", "block.gtceu.zpm_wiremill": "§cЕлітний волок III§r", "block.gtceu.zpm_world_accelerator": "§cЕлітний світовий прискорювач III§r", - "block.sterilizing_filter_casing.tooltip": "Створює§a стерильне§7 середовище", + "block.gtceu.sterilizing_filter_casing.tooltip": "Створює§a стерильне§7 середовище", "block.gtceu.surface_rock": "%s (поверхневий поклад)", "button.gtceu.mark_as_depleted.name": "Позначити як виснажений", "button.gtceu.toggle_waypoint.name": "Перемикнути маршрутну точку", @@ -2231,8 +2231,6 @@ "enchantment.gtceu.disjunction.description": "Застосовує Слабкість і Повільність до пов’язаних з Ендом мобів.", "enchantment.gtceu.hard_hammer.description": "Розбиває блоки так, ніби вони були видобуті за допомогою молота GregTech.", "enchantment.hard_hammer": "Забивання", - "entity.gtceu.boat": "Човен", - "entity.gtceu.chest_boat": "Човен зі скринею", "entity.gtceu.dynamite": "Динамітна шашка", "entity.gtceu.industrial_tnt": "Промисловий динаміт", "entity.gtceu.powderbarrel": "Порохова бочка", @@ -2242,19 +2240,19 @@ "fluid.tile.lava": "Лава", "fluid.tile.water": "Вода", "fluid_cell.empty": "Порожньо", - "gtceu.air_scrubber": "Очисник повітря", - "gtceu.alloy_blast_smelter": "Доменна плавильня сплавів", - "gtceu.alloy_smelter": "Плавильня сплавів", - "gtceu.arc_furnace": "Дугова піч", - "gtceu.assembler": "Збирач", - "gtceu.assembly_line": "Конвеєрна лінія", + "recipe_type.gtceu.air_scrubber": "Очисник повітря", + "recipe_type.gtceu.alloy_blast_smelter": "Доменна плавильня сплавів", + "recipe_type.gtceu.alloy_smelter": "Плавильня сплавів", + "recipe_type.gtceu.arc_furnace": "Дугова піч", + "recipe_type.gtceu.assembler": "Збирач", + "recipe_type.gtceu.assembly_line": "Конвеєрна лінія", "gtceu.auto_decomp.rotor": "Ротор турбіни", "gtceu.auto_decomp.tool": "Неелектричний інструмент", - "gtceu.autoclave": "Автоклав", + "recipe_type.gtceu.autoclave": "Автоклав", "gtceu.battery_buffer.average_input": "Середній вхід: %s EU/т", "gtceu.battery_buffer.average_output": "Середній вихід: %s EU/т", - "gtceu.bender": "Згинач", - "gtceu.brewery": "Варильник", + "recipe_type.gtceu.bender": "Згинач", + "recipe_type.gtceu.brewery": "Варильник", "gtceu.bus.collapse.error": "Спочатку шина повинна бути приєднана до конструкції", "gtceu.bus.collapse_false": "Шина не руйнуватиме предмети", "gtceu.bus.collapse_true": "Шина руйнуватиме предмети", @@ -2266,7 +2264,7 @@ "gtceu.cable.loss_per_block": "Втрати/Метр/Ампер:§c %d§7 EU-Вольт", "gtceu.cable.superconductor": "§d%s Надпровідник", "gtceu.cable.voltage": "Макс. напруга:§a %d§a (%s§a)", - "gtceu.canner": "Герметизатор", + "recipe_type.gtceu.canner": "Герметизатор", "gtceu.central_monitor.gui.create_group": "Створити групу", "gtceu.central_monitor.gui.currently_editing": "Наразі редагується: %s", "gtceu.central_monitor.gui.data_slot": "Встановити номер слота картки даних", @@ -2285,19 +2283,19 @@ "gtceu.central_monitor.info_tooltip.7": "Помістіть кришку на цільовий блок, клацніть на ній ПКМ з каткою даних і вставте цю картку даних в люк доступу до даних в конструкції.", "gtceu.central_monitor.info_tooltip.8": "Потім виберіть люк доступу до даних як ціль і встановіть індекс слота вашої картки даних в полі для введення цифр, яке з’явилося.", "gtceu.central_monitor.size": "Розмір: (%d+1+%d)x(%d+1+%d)", - "gtceu.centrifuge": "Центрифуга", + "recipe_type.gtceu.centrifuge": "Центрифуга", "gtceu.chance_logic.and": "AND", "gtceu.chance_logic.first": "FIRST", "gtceu.chance_logic.none": "NONE", "gtceu.chance_logic.or": "OR", "gtceu.chance_logic.xor": "XOR", "gtceu.chat.cape": "§5Вітаємо: ви щойно розблокували новий плащ! Дивіться в термінальному додатку обирач плащів, щоб скористатися ним.§r", - "gtceu.chemical_bath": "Хімічна ванна", - "gtceu.chemical_reactor": "Хімічний реактор", - "gtceu.circuit_assembler": "Схемотехнічний збирач", - "gtceu.coke_oven": "Коксова піч", - "gtceu.combustion_generator": "Генератор внутрішнього згоряння", - "gtceu.compressor": "Компресор", + "recipe_type.gtceu.chemical_bath": "Хімічна ванна", + "recipe_type.gtceu.chemical_reactor": "Хімічний реактор", + "recipe_type.gtceu.circuit_assembler": "Схемотехнічний збирач", + "recipe_type.gtceu.coke_oven": "Коксова піч", + "recipe_type.gtceu.combustion_generator": "Генератор внутрішнього згоряння", + "recipe_type.gtceu.compressor": "Компресор", "gtceu.computer_monitor_cover.error.bf_invalid": "Недійсний символ у %d", "gtceu.computer_monitor_cover.error.bf_invalid_num": "Недійсне число в індексі %d під час обробки символу № %d", "gtceu.computer_monitor_cover.error.exception": "Сталася несподівана виняткова ситуація: %s", @@ -2323,7 +2321,7 @@ "gtceu.cover.fluid_detector.message_fluid_storage_normal": "Моніторинг нормального зберігання рідин", "gtceu.cover.item_detector.message_item_storage_inverted": "Моніторинг інвертованого зберігання предметів", "gtceu.cover.item_detector.message_item_storage_normal": "Моніторинг нормального зберігання предметів", - "gtceu.cracker": "Крекер", + "recipe_type.gtceu.cracker": "Крекер", "gtceu.creative.activity.off": "Неактивний", "gtceu.creative.activity.on": "Активний", "gtceu.creative.chest.ipc": "Предмети за цикл", @@ -2341,7 +2339,7 @@ "gtceu.creative_tooltip.1": "§7Вам потрібен", "gtceu.creative_tooltip.2": " творчий режим", "gtceu.creative_tooltip.3": "§7, щоб використовувати це", - "gtceu.cutter": "Різак", + "recipe_type.gtceu.cutter": "Різак", "gtceu.debug.f3_h.enabled": "GregTech змінив інформацію про налагодження! Для розробників: увімкніть опцію misc:debug config у конфігураційному файлі GregTech, щоб побачити більше", "gtceu.debug.resource_rebuild.done": "Перебудова ресурсу Gradle виконана за %s", "gtceu.debug.resource_rebuild.start": "Виклик перебудови ресурсів gradle (./gradlew :processResources)", @@ -2353,22 +2351,22 @@ "gtceu.direction.tooltip.up": "Верх", "gtceu.display_source.computer_monitor_cover": "Кришка монітора комп’ютера", "gtceu.display_target.computer_monitor_cover": "Кришка монітора комп’ютера", - "gtceu.distillation_tower": "Дистиляційна вежа", - "gtceu.distillery": "Дистилятор", + "recipe_type.gtceu.distillation_tower": "Дистиляційна вежа", + "recipe_type.gtceu.distillery": "Дистилятор", "gtceu.duct_pipe.transfer_rate": "§bШвидкість передачі повітря: %s", - "gtceu.dummy": "Манекен", - "gtceu.electric_blast_furnace": "Електрична доменна піч", - "gtceu.electric_furnace": "Електрична піч", - "gtceu.electrolyzer": "Електролізер", - "gtceu.electromagnetic_separator": "Електромагнітний сепаратор", + "recipe_type.gtceu.dummy": "Манекен", + "recipe_type.gtceu.electric_blast_furnace": "Електрична доменна піч", + "recipe_type.gtceu.electric_furnace": "Електрична піч", + "recipe_type.gtceu.electrolyzer": "Електролізер", + "recipe_type.gtceu.electromagnetic_separator": "Електромагнітний сепаратор", "gtceu.ender_item_link_cover.title": "Предметний зв’язок Енду", "gtceu.ender_item_link_cover.tooltip": "§7Переміщує §fпредмети§7 за допомогою§f бездротового з’єднання §dЕнду§7 як§f кришка§7.", "gtceu.ender_redstone_link_cover.label": "Редстоунове живлення: %d", "gtceu.ender_redstone_link_cover.title": "Редстоуновий зв’язок Енду", "gtceu.ender_redstone_link_cover.tooltip": "§7Переміщує §fредстоунові сигнали§7 за допомогою§f бездротового з’єднання §dЕнду§7 як§f кришка§7.", - "gtceu.extractor": "Екстрактор", - "gtceu.extruder": "Екструдер", - "gtceu.fermenter": "Ферментатор", + "recipe_type.gtceu.extractor": "Екстрактор", + "recipe_type.gtceu.extruder": "Екструдер", + "recipe_type.gtceu.fermenter": "Ферментатор", "gtceu.fluid.amount": "§9Місткість: %d/%d мВ", "gtceu.fluid.click_combined": "§7Клацніть контейнером з рідиною, щоб§b спустошити§7 або§b заповнити§7 бак (Shift-клік для повного стосу).", "gtceu.fluid.click_to_empty": "§7Клацніть контейнером з рідиною, щоб§b спустошити§7 бак (Shift-клік для повного стосу).", @@ -2386,7 +2384,7 @@ "gtceu.fluid.temperature": "§cТемпература: %s", "gtceu.fluid.temperature.cryogenic": "§bКріогенна небезпека! Тримайте обережно!", "gtceu.fluid.type_acid.tooltip": "§6Кислотна небезпека! Тримайте обережно!", - "gtceu.fluid_heater": "Рідинний нагрівач", + "recipe_type.gtceu.fluid_heater": "Рідинний нагрівач", "gtceu.fluid_pipe.acid_proof": "§6Може працювати з кислотами", "gtceu.fluid_pipe.capacity": "§9Місткість:§f %d мВ", "gtceu.fluid_pipe.channels": "§eКанали:§f %d", @@ -2395,15 +2393,15 @@ "gtceu.fluid_pipe.max_temperature": "§cМежа температури:§f %s", "gtceu.fluid_pipe.not_gas_proof": "§4Можливий витік газів!", "gtceu.fluid_pipe.plasma_proof": "§6Може працювати з усіма видами плазми", - "gtceu.fluid_solidifier": "Рідинний затверджувач", - "gtceu.forge_hammer": "Ковальський молот", - "gtceu.forming_press": "Формовий прес", + "recipe_type.gtceu.fluid_solidifier": "Рідинний затверджувач", + "recipe_type.gtceu.forge_hammer": "Ковальський молот", + "recipe_type.gtceu.forming_press": "Формовий прес", "gtceu.forming_press.naming.named": "§oПерейменований предмет", "gtceu.forming_press.naming.press": "§oІменувальний прес", "gtceu.forming_press.naming.to_name": "§oПредмет до перейменування", - "gtceu.fusion_reactor": "Термоядерний реактор", - "gtceu.gas_collector": "Газозбірник", - "gtceu.gas_turbine": "Газова турбіна", + "recipe_type.gtceu.fusion_reactor": "Термоядерний реактор", + "recipe_type.gtceu.gas_collector": "Газозбірник", + "recipe_type.gtceu.gas_turbine": "Газова турбіна", "gtceu.gui.adv_stocking_config.min_fluid_count": "Мінімальний розмір стосу рідини для автоматичного витягування", "gtceu.gui.adv_stocking_config.min_item_count": "Мінімальний розмір стосу предметів для автоматичного витягування", "gtceu.gui.adv_stocking_config.ticks_per_cycle": "Затримка між оновленнями списку предметів", @@ -2563,7 +2561,7 @@ "gtceu.gui.toggle_view.enabled": "Перемкнути вид (Предмети)", "gtceu.gui.waiting_list": "Черга на відправлення:", "gtceu.gui.waiting_list_empty": "Черга відправки: §2Порожня", - "gtceu.implosion_compressor": "Імплозійний компресор", + "recipe_type.gtceu.implosion_compressor": "Імплозійний компресор", "gtceu.io.both": "Обидва", "gtceu.io.export": "Експорт", "gtceu.io.import": "Імпорт", @@ -2591,14 +2589,14 @@ "gtceu.jade.remaining_discharge_time": "До розряджання: %s", "gtceu.jade.seconds": "%s секунд", "gtceu.jade.years": "%s років", - "gtceu.jei.bedrock_fluid.heavy_oil_deposit": "Поклад важкої нафти", - "gtceu.jei.bedrock_fluid.lava_deposit": "Поклад лави", - "gtceu.jei.bedrock_fluid.light_oil_deposit": "Поклад легкої нафти", - "gtceu.jei.bedrock_fluid.natural_gas_deposit": "Поклад природного газу", - "gtceu.jei.bedrock_fluid.nether_natural_gas_deposit": "Незерський поклад природного газу", - "gtceu.jei.bedrock_fluid.oil_deposit": "Поклад нафти", - "gtceu.jei.bedrock_fluid.raw_oil_deposit": "Поклад сирої нафти", - "gtceu.jei.bedrock_fluid.salt_water_deposit": "Поклад солоної води", + "bedrock_fluid.gtceu.heavy_oil_deposit": "Поклад важкої нафти", + "bedrock_fluid.gtceu.lava_deposit": "Поклад лави", + "bedrock_fluid.gtceu.light_oil_deposit": "Поклад легкої нафти", + "bedrock_fluid.gtceu.natural_gas_deposit": "Поклад природного газу", + "bedrock_fluid.gtceu.nether_natural_gas_deposit": "Незерський поклад природного газу", + "bedrock_fluid.gtceu.oil_deposit": "Поклад нафти", + "bedrock_fluid.gtceu.raw_oil_deposit": "Поклад сирої нафти", + "bedrock_fluid.gtceu.salt_water_deposit": "Поклад солоної води", "gtceu.jei.bedrock_fluid_diagram": "Діаграма глибокореневих рідин", "gtceu.jei.bedrock_ore_diagram": "Діаграма глибокореневих руд", "gtceu.jei.bedrock_vein_diagram.depleted": "Виснаженість: %s", @@ -2635,46 +2633,46 @@ "gtceu.jei.ore.surface_rock.0": "Поверхневі утворення з цим матеріалом позначають місця генерації жил.", "gtceu.jei.ore.surface_rock.1": "Їх можна розбити, щоб отримати 3-5 крихт пилу, та ще більше із удачею.", "gtceu.jei.ore_processing_diagram": "Послідовна рудообробка", - "gtceu.jei.ore_vein.apatite_vein": "Апатитова жила", - "gtceu.jei.ore_vein.banded_iron_vein": "Стрічкова залізна жила", - "gtceu.jei.ore_vein.bauxite_vein_end": "Бокситова жила Енду", - "gtceu.jei.ore_vein.beryllium_vein": "Берилієва жила", - "gtceu.jei.ore_vein.cassiterite_vein": "Каситеритова жила", - "gtceu.jei.ore_vein.certus_quartz": "Істинний кварц", - "gtceu.jei.ore_vein.coal_vein": "Вугільна жила", - "gtceu.jei.ore_vein.copper_tin_vein": "Мідно-олов’яна жила", - "gtceu.jei.ore_vein.copper_vein": "Мідна жила", - "gtceu.jei.ore_vein.diamond_vein": "Діамантова жила", - "gtceu.jei.ore_vein.galena_vein": "Галенова жила", - "gtceu.jei.ore_vein.garnet_tin_vein": "Гранатово-олов’яна жила", - "gtceu.jei.ore_vein.garnet_vein": "Гранатова жила", - "gtceu.jei.ore_vein.iron_vein": "Залізна жила", - "gtceu.jei.ore_vein.lapis_vein": "Лазурова жила", - "gtceu.jei.ore_vein.lubricant_vein": "Мастильна жила", - "gtceu.jei.ore_vein.magnetite_vein_end": "Магнетитова жила Енду", - "gtceu.jei.ore_vein.magnetite_vein_ow": "Магнетитова жила вС", - "gtceu.jei.ore_vein.manganese_vein": "Марганцева жила", - "gtceu.jei.ore_vein.manganese_vein_ow": "Марганцева жила вС", - "gtceu.jei.ore_vein.mica_vein": "Слюдяна жила", - "gtceu.jei.ore_vein.mineral_sand_vein": "Жила мінерального піску", - "gtceu.jei.ore_vein.molybdenum_vein": "Молібденова жила", - "gtceu.jei.ore_vein.monazite_vein": "Монацитова жила", - "gtceu.jei.ore_vein.naquadah_vein": "Наквадова жила", - "gtceu.jei.ore_vein.nether_quartz_vein": "Нижня кварцова жила", - "gtceu.jei.ore_vein.nickel_vein": "Нікелева жила", - "gtceu.jei.ore_vein.oilsands_vein": "Жила нафтоносних пісків", - "gtceu.jei.ore_vein.olivine_vein": "Олівінова жила", - "gtceu.jei.ore_vein.pitchblende_vein_end": "Настуранова жила Енду", - "gtceu.jei.ore_vein.redstone_vein": "Редстоунова жила", - "gtceu.jei.ore_vein.redstone_vein_ow": "Редстоунова жила вС", - "gtceu.jei.ore_vein.saltpeter_vein": "Селітрова жила", - "gtceu.jei.ore_vein.salts_vein": "Соляна жила", - "gtceu.jei.ore_vein.sapphire_vein": "Сапфірова жила", - "gtceu.jei.ore_vein.scheelite_vein": "Шеєлітова жила", - "gtceu.jei.ore_vein.sheldonite_vein": "Шелдонітова жила", - "gtceu.jei.ore_vein.sulfur_vein": "Сірчана жила", - "gtceu.jei.ore_vein.tetrahedrite_vein": "Тетраедритова жила", - "gtceu.jei.ore_vein.topaz_vein": "Топазова жила", + "ore_vein.gtceu.apatite": "Апатитова", + "ore_vein.gtceu.banded_iron": "Стрічкова залізна", + "ore_vein.gtceu.end_bauxite": "Бокситова Енду", + "ore_vein.gtceu.beryllium": "Берилієва", + "ore_vein.gtceu.cassiterite": "Каситеритова", + "ore_vein.gtceu.certus_quartz": "Істинний кварц", + "ore_vein.gtceu.coal": "Вугільна", + "ore_vein.gtceu.copper_tin": "Мідно-олов’яна", + "ore_vein.gtceu.copper": "Мідна", + "ore_vein.gtceu.diamond": "Діамантова", + "ore_vein.gtceu.galena": "Галенова", + "ore_vein.gtceu.garnet_tin": "Гранатово-олов’яна", + "ore_vein.gtceu.garnet": "Гранатова", + "ore_vein.gtceu.iron": "Залізна", + "ore_vein.gtceu.lapis": "Лазурова", + "ore_vein.gtceu.lubricant": "Мастильна", + "ore_vein.gtceu.end_magnetite": "Магнетитова Енду", + "ore_vein.gtceu.magnetite": "Магнетитова", + "ore_vein.gtceu.nether_manganese": "Марганцева Нижня", + "ore_vein.gtceu.manganese": "Марганцева", + "ore_vein.gtceu.mica": "Слюдяна", + "ore_vein.gtceu.mineral_sand": "Жила мінерального піску", + "ore_vein.gtceu.molybdenum": "Молібденова", + "ore_vein.gtceu.monazite": "Монацитова", + "ore_vein.gtceu.naquadah": "Наквадова", + "ore_vein.gtceu.nether_quartz": "Нижня кварцова", + "ore_vein.gtceu.nickel": "Нікелева", + "ore_vein.gtceu.oilsands": "Жила нафтоносних пісків", + "ore_vein.gtceu.olivine": "Олівінова", + "ore_vein.gtceu.pitchblende": "Настуранова", + "ore_vein.gtceu.nether_redstone": "Редстоунова Нижня", + "ore_vein.gtceu.redstone": "Редстоунова", + "ore_vein.gtceu.saltpeter": "Селітрова", + "ore_vein.gtceu.salts": "Соляна", + "ore_vein.gtceu.sapphire": "Сапфірова", + "ore_vein.gtceu.scheelite": "Шеєлітова", + "ore_vein.gtceu.sheldonite": "Шелдонітова", + "ore_vein.gtceu.sulfur": "Сірчана", + "ore_vein.gtceu.tetrahedrite": "Тетраедритова", + "ore_vein.gtceu.topaz": "Топазова", "gtceu.jei.ore_vein_diagram": "Залягання руди", "gtceu.jei.ore_vein_diagram.chance": "§eШанс: %s§r", "gtceu.jei.ore_vein_diagram.dimensions": "Виміри:", @@ -2689,11 +2687,11 @@ "gtceu.key.enable_jetpack": "Реактивний ранець", "gtceu.key.enable_step_assist": "Увімкнути допомогу кроку", "gtceu.key.tool_aoe_change": "Перемикання роботи по області інструменту", - "gtceu.large_boiler": "Великий котел", - "gtceu.large_chemical_reactor": "Великий хімічний реактор", - "gtceu.laser_engraver": "Літограф", - "gtceu.lathe": "Токар", - "gtceu.macerator": "Подрібнювач", + "recipe_type.gtceu.large_boiler": "Великий котел", + "recipe_type.gtceu.large_chemical_reactor": "Великий хімічний реактор", + "recipe_type.gtceu.laser_engraver": "Літограф", + "recipe_type.gtceu.lathe": "Токар", + "recipe_type.gtceu.macerator": "Подрібнювач", "gtceu.machine.active_transformer.tooltip.0": "§7Трансформатори: замасковані лазери", "gtceu.machine.active_transformer.tooltip.1": "§7Може об’єднати будь-яку кількість енергетичних§f входів§7 у будь-яку кількість енергетичних§f виходів§7.", "gtceu.machine.active_transformer.tooltip.2": "§7Може передавати енергію на неймовірні відстані за допомогою", @@ -3319,7 +3317,7 @@ "gtceu.maintenance.configurable_time.changed_description": "Проблеми з обслуговуванням виникатимуть у %f разів частіше.", "gtceu.maintenance.configurable_time.unchanged_description": "Проблеми з обслуговуванням виникатимуть зі звичайною швидкістю. Змініть конфігурацію для оновлення.", "gtceu.minimap.ore_vein.depleted": "Виснажено", - "gtceu.mixer": "Змішувач", + "recipe_type.gtceu.mixer": "Змішувач", "gtceu.mode.both": "§dСпільний (Рідини та предмети)§r", "gtceu.mode.fluid": "§9Рідини§r", "gtceu.mode.item": "§6Предмети§r", @@ -3566,11 +3564,11 @@ "gtceu.oc.tooltip.2": "ПКМ, щоб зменшити розгін", "gtceu.oc.tooltip.3": "СКМ, щоб скинути розгін", "gtceu.oc.tooltip.4": "Утримуйте Shift, щоб змінювати ідеальний розгін", - "gtceu.ore_washer": "Рудопромивач", + "recipe_type.gtceu.ore_washer": "Рудопромивач", "gtceu.ownership.name.argonauts": "Гільдія Аргонавтів", "gtceu.ownership.name.ftb": "FTB Teams", "gtceu.ownership.name.player": "Гравець", - "gtceu.packer": "Пакувальник", + "recipe_type.gtceu.packer": "Пакувальник", "gtceu.part_sharing.disabled": "Спільний доступ конструкції§4 вимкнено", "gtceu.part_sharing.enabled": "Спільний доступ конструкції§a увімкнено", "gtceu.pattern_error.mismatch_coils": "Невідповідні котушки: %s проти %s у (%d, %d, %d)", @@ -3803,8 +3801,8 @@ "gtceu.placeholder_info.voltage.0": "Повертає напругу в дроті/кабелі, на якому ввімкнена кришка.", "gtceu.placeholder_info.voltage.1": "Використання:", "gtceu.placeholder_info.voltage.2": " {voltage} -> напруга в дроті/кабелі", - "gtceu.plasma_generator": "Плазмовий генератор", - "gtceu.polarizer": "Намагнічувач", + "recipe_type.gtceu.plasma_generator": "Плазмовий генератор", + "recipe_type.gtceu.polarizer": "Намагнічувач", "gtceu.predicate_error.active_transformer.missing_io": "Відсутні люки: ВХІД - %s | ВИХІД - %s", "gtceu.predicate_error.charcoal.logs": "Має бути повністю заповнене колодами.", "gtceu.predicate_error.charcoal.walls": "Неправильний блок стіни у (%d, %d, %d).", @@ -3818,18 +3816,18 @@ "gtceu.predicate_error.research.missing_computation": "Відсутній люк обчислень.", "gtceu.predicate_error.research.missing_object_holder": "Відсутній люк тримача об’єктів.", "gtceu.predicate_error.steam.missing_steam_hatch": "Відсутній люк пари", - "gtceu.primitive_blast_furnace": "Примітивна сталеливарня", + "recipe_type.gtceu.primitive_blast_furnace": "Примітивна сталеливарня", "gtceu.provider.computer_monitor_cover.error.no_target": "Для групи моніторів не обрано цілі", - "gtceu.pyrolyse_oven": "Піролізна піч", + "recipe_type.gtceu.pyrolyse_oven": "Піролізна піч", "gtceu.recipe.byproduct_tier": "Побічні продукти з %s§r+", - "gtceu.recipe.category.arc_furnace_recycling": "Дугова переробка", - "gtceu.recipe.category.chem_dyes": "Хімічне розфарбовування", - "gtceu.recipe.category.extractor_recycling": "Переливання металобрухту", - "gtceu.recipe.category.ingot_molding": "Лиття металу", - "gtceu.recipe.category.macerator_recycling": "Переробка", - "gtceu.recipe.category.ore_bathing": "Рудообробка", - "gtceu.recipe.category.ore_crushing": "Подрібнення руд", - "gtceu.recipe.category.ore_forging": "Дроблення руд", + "recipe_category.gtceu.arc_furnace_recycling": "Дугова переробка", + "recipe_category.gtceu.chem_dyes": "Хімічне розфарбовування", + "recipe_category.gtceu.extractor_recycling": "Переливання металобрухту", + "recipe_category.gtceu.ingot_molding": "Лиття металу", + "recipe_category.gtceu.macerator_recycling": "Переробка", + "recipe_category.gtceu.ore_bathing": "Рудообробка", + "recipe_category.gtceu.ore_crushing": "Подрібнення руд", + "recipe_category.gtceu.ore_forging": "Дроблення руд", "gtceu.recipe.chance": "Шанс: %s +%s/рівень", "gtceu.recipe.cleanroom": "Потребує %s", "gtceu.recipe.cleanroom.display_name": "Чиста кімната", @@ -3870,15 +3868,15 @@ "gtceu.recipe_modifier.insufficient_voltage": "Рівень напруги надто низький", "gtceu.recipe_type.show_recipes": "Показати рецепти", "gtceu.rei.group.potion_fluids": "Рідини зіллів", - "gtceu.research_station": "Дослідницька станція", - "gtceu.rock_breaker": "Кам’яна дробарка", - "gtceu.scanner": "Сканер", + "recipe_type.gtceu.research_station": "Дослідницька станція", + "recipe_type.gtceu.rock_breaker": "Кам’яна дробарка", + "recipe_type.gtceu.scanner": "Сканер", "gtceu.scanner.copy_stick_empty": "§oПорожня картка", "gtceu.scanner.copy_stick_from": "§oКопіювання до картки", "gtceu.scanner.copy_stick_to": "§oВставка з картки", - "gtceu.sifter": "Просіювач", - "gtceu.steam_boiler": "Паровий котел", - "gtceu.steam_turbine": "Парова турбіна", + "recipe_type.gtceu.sifter": "Просіювач", + "recipe_type.gtceu.steam_boiler": "Паровий котел", + "recipe_type.gtceu.steam_turbine": "Парова турбіна", "gtceu.subtitle.arc": "Дуги дзижчать", "gtceu.subtitle.assembler": "Збирач конструює", "gtceu.subtitle.bath": "Ванна шипить", @@ -3918,7 +3916,7 @@ "gtceu.subtitle.turbine": "Свист турбіни", "gtceu.subtitle.wirecutter": "Дріт рветься", "gtceu.subtitle.wrench": "Ключ брязкає", - "gtceu.thermal_centrifuge": "Термічна центрифуга", + "recipe_type.gtceu.thermal_centrifuge": "Термічна центрифуга", "gtceu.tool.class.axe": "Сокира", "gtceu.tool.class.butchery_knife": "М’ясний ніж", "gtceu.tool.class.crowbar": "Лом", @@ -4072,8 +4070,8 @@ "gtceu.universal.tooltip.working_area_chunks": "§bРобоча зона:§f %dx%d чанків", "gtceu.universal.tooltip.working_area_chunks_max": "§bМакс. робоча зона:§f %dx%d чанків", "gtceu.universal.tooltip.working_area_max": "§bМакс. робоча зона:§f %dx%d", - "gtceu.vacuum_freezer": "Вакуумна морозильна камера", - "gtceu.wiremill": "Волок", + "recipe_type.gtceu.vacuum_freezer": "Вакуумна морозильна камера", + "recipe_type.gtceu.wiremill": "Волок", "gui.gtceu.refund_all.desc": "Повернути збережений вміст до AE2", "gui.gtceu.rename.desc": "Перейменувати буфер деталей", "gui.gtceu.share_inventory.desc.0": "Ділиться вставленими предметами з усіма шаблонами в буфері!", @@ -4329,11 +4327,11 @@ "item.gtceu.fullers_earth_dust": "Відбілювальні глини", "item.gtceu.garnet_sand_dust": "Гранатовий пісок", "item.gtceu.gear_casting_mold": "Відливна форма (шестірня)", - "item.gtceu.gear_casting_mold.small.tooltip": "§7Форма для виготовлення малих шестерень", + "item.gtceu.small_gear_casting_mold.tooltip": "§7Форма для виготовлення малих шестерень", "item.gtceu.gear_casting_mold.tooltip": "§7Форма для виготовлення шестерень", "item.gtceu.gear_extruder_mold": "Відтискна форма (шестірня)", "item.gtceu.gear_extruder_mold.tooltip": "§7Формовий відтиск для виготовлення шестерень", - "item.gtceu.gear_small_extruder_mold.tooltip": "§7Формовий відтиск для виготовлення малих шестерень", + "item.gtceu.small_gear_extruder_mold.tooltip": "§7Формовий відтиск для виготовлення малих шестерень", "item.gtceu.gelled_toluene": "Гелевий толуол", "item.gtceu.gelled_toluene.tooltip": "§7Сира вибухівка", "item.gtceu.glass_gem": "Скляний кристал", @@ -4423,9 +4421,9 @@ "item.gtceu.item_filter": "Фільтр предметів", "item.gtceu.item_filter.tooltip.0": "§7Фільтрує§f предметний§7 вхід/вихід як§f кришка§7.", "item.gtceu.item_filter.tooltip.1": "Може використовуватися як§f конвеєрний модуль§7 та покращення§f маніпулятора§7.", - "item.gtceu.item_smart_filter": "Розумний фільтр предметів", - "item.gtceu.item_smart_filter.tooltip.0": "§7Фільтрує§f предметний§7 вхід/вихід із§f рецептами машини§7 як§f кришка§7.", - "item.gtceu.item_smart_filter.tooltip.1": "Може використовуватися як§f конвеєрний модуль§7 та покращення§f маніпулятора§7.", + "item.gtceu.smart_item_filter": "Розумний фільтр предметів", + "item.gtceu.smart_item_filter.tooltip.0": "§7Фільтрує§f предметний§7 вхід/вихід із§f рецептами машини§7 як§f кришка§7.", + "item.gtceu.smart_item_filter.tooltip.1": "Може використовуватися як§f конвеєрний модуль§7 та покращення§f маніпулятора§7.", "item.gtceu.item_tag_filter": "Предметний теґовий фільтр", "item.gtceu.item_tag_filter.tooltip.0": "§7Фільтрує§f предметний§7 вхід/вихід із§f предметними теґами§7 як§f кришка§7.", "item.gtceu.item_tag_filter.tooltip.1": "Може використовуватися як§f конвеєрний модуль§7 та покращення§f маніпулятора§7.", @@ -4648,16 +4646,16 @@ "item.gtceu.pill_casting_mold": "Відливна форма (пігулка)", "item.gtceu.pink_dye_spray_can": "Аерозольний балончик (рожевий)", "item.gtceu.pink_glass_lens": "Скляна лінза (рожева)", - "item.gtceu.pipe.huge_casting_mold.tooltip": "§7Форма для відливання повноблокових труб", - "item.gtceu.pipe.huge_extruder_mold.tooltip": "§7Формовий відтиск для виготовлення повноблокових труб", - "item.gtceu.pipe.large_casting_mold.tooltip": "§7Форма для відливання великих труб", - "item.gtceu.pipe.large_extruder_mold.tooltip": "§7Формовий відтиск для виготовлення великих труб", - "item.gtceu.pipe.normal_casting_mold.tooltip": "§7Форма для відливання труб", - "item.gtceu.pipe.normal_extruder_mold.tooltip": "§7Формовий відтиск для виготовлення труб", - "item.gtceu.pipe.small_casting_mold.tooltip": "§7Форма для відливання малих труб", - "item.gtceu.pipe.small_extruder_mold.tooltip": "§7Формовий відтиск для виготовлення малих труб", - "item.gtceu.pipe.tiny_casting_mold.tooltip": "§7Форма для відливання крихітних труб", - "item.gtceu.pipe.tiny_extruder_mold.tooltip": "§7Формовий відтиск для виготовлення крихітних труб", + "item.gtceu.huge_pipe_casting_mold.tooltip": "§7Форма для відливання повноблокових труб", + "item.gtceu.huge_pipe_extruder_mold.tooltip": "§7Формовий відтиск для виготовлення повноблокових труб", + "item.gtceu.large_pipe_casting_mold.tooltip": "§7Форма для відливання великих труб", + "item.gtceu.large_pipe_extruder_mold.tooltip": "§7Формовий відтиск для виготовлення великих труб", + "item.gtceu.normal_pipe_casting_mold.tooltip": "§7Форма для відливання труб", + "item.gtceu.normal_pipe_extruder_mold.tooltip": "§7Формовий відтиск для виготовлення труб", + "item.gtceu.small_pipe_casting_mold.tooltip": "§7Форма для відливання малих труб", + "item.gtceu.small_pipe_extruder_mold.tooltip": "§7Формовий відтиск для виготовлення малих труб", + "item.gtceu.tiny_pipe_casting_mold.tooltip": "§7Форма для відливання крихітних труб", + "item.gtceu.tiny_pipe_extruder_mold.tooltip": "§7Формовий відтиск для виготовлення крихітних труб", "item.gtceu.pitchblende_dust": "Настуран", "item.gtceu.plant_ball": "Рослинна кулька", "item.gtceu.plastic_circuit_board": "Пластикова плата", @@ -4750,7 +4748,7 @@ "item.gtceu.rock_salt_dust": "Кам’яна сіль", "item.gtceu.rod_extruder_mold": "Відтискна форма (стрижень)", "item.gtceu.rod_extruder_mold.tooltip": "§7Формовий відтиск для виготовлення стрижнів", - "item.gtceu.rod_long_extruder_mold.tooltip": "§7Формовий відтиск для виготовлення довгих стрижнів", + "item.gtceu.long_rod_extruder_mold.tooltip": "§7Формовий відтиск для виготовлення довгих стрижнів", "item.gtceu.rotor_casting_mold": "Відливна форма (ротор)", "item.gtceu.rotor_casting_mold.tooltip": "§7Форма для виготовлення роторів", "item.gtceu.rotor_extruder_mold": "Відтискна форма (ротор)", @@ -5364,7 +5362,7 @@ "material.gtceu.goethite": "Ґетит", "material.gtceu.gold": "Золото", "material.gtceu.granite": "Граніт", - "material.gtceu.granite_red": "Червоний граніт", + "material.gtceu.red_granite": "Червоний граніт", "material.gtceu.granitic_mineral_sand": "Гранітний мінеральний пісок", "material.gtceu.graphene": "Графен", "material.gtceu.graphite": "Графіт", @@ -5534,9 +5532,9 @@ "material.gtceu.octane": "Октан", "material.gtceu.oganesson": "Оґанесон", "material.gtceu.oil": "Нафта", - "material.gtceu.oil_heavy": "Важка нафта", - "material.gtceu.oil_light": "Легка нафта", - "material.gtceu.oil_medium": "Сира нафта", + "material.gtceu.heavy_oil": "Важка нафта", + "material.gtceu.light_oil": "Легка нафта", + "material.gtceu.raw_oil": "Сира нафта", "material.gtceu.oilsands": "Нафтоносні піски", "material.gtceu.olivine": "Олівін", "material.gtceu.opal": "Опал", @@ -5564,7 +5562,7 @@ "material.gtceu.platinum_group_sludge": "Шлам платинової групи", "material.gtceu.platinum_raw": "Необроблена платина", "material.gtceu.platinum_sludge_residue": "Залишок платинового шламу", - "material.gtceu.plutonium": "Плутоній", + "material.gtceu.plutonium_239": "Плутоній 239", "material.gtceu.plutonium_241": "Плутоній 241", "material.gtceu.pollucite": "Поллуцит", "material.gtceu.polonium": "Полоній", @@ -5748,7 +5746,7 @@ "material.gtceu.tungstic_acid": "Вольфрамова кислота", "material.gtceu.ultimet": "Ультимет", "material.gtceu.uraninite": "Уранініт", - "material.gtceu.uranium": "Уран", + "material.gtceu.uranium_238": "Уран 238", "material.gtceu.uranium_235": "Уран 235", "material.gtceu.uranium_hexafluoride": "Гексафторид урану", "material.gtceu.uranium_rhodium_dinaquadide": "Уран родій динаквадид", @@ -5940,7 +5938,7 @@ "tagprefix.blackstone": "%s (чорнокам’яна руда)", "tagprefix.block": "%s (блок)", "tagprefix.bolt": "Болт (%s)", - "tagprefix.buzz_saw_blade": "Лезо електропили (%s)", + "tagprefix.buzzsaw_blade": "Лезо електропили (%s)", "tagprefix.cable_gt_double": "2x кабель (%s)", "tagprefix.cable_gt_hex": "16x кабель (%s)", "tagprefix.cable_gt_octal": "8x кабель (%s)", diff --git a/src/main/resources/assets/gtceu/lang/zh_cn.json b/src/main/resources/assets/gtceu/lang/zh_cn.json index f13a1bf93db..0e0fc8d1373 100644 --- a/src/main/resources/assets/gtceu/lang/zh_cn.json +++ b/src/main/resources/assets/gtceu/lang/zh_cn.json @@ -1,12 +1,4 @@ { - "bedrock_fluid.gtceu.heavy_oil_deposit": "重油矿藏", - "bedrock_fluid.gtceu.lava_deposit": "熔岩矿藏", - "bedrock_fluid.gtceu.light_oil_deposit": "轻油矿藏", - "bedrock_fluid.gtceu.natural_gas_deposit": "天然气矿藏", - "bedrock_fluid.gtceu.nether_natural_gas_deposit": "下界天然气矿藏", - "bedrock_fluid.gtceu.oil_deposit": "石油矿藏", - "bedrock_fluid.gtceu.raw_oil_deposit": "原油矿藏", - "bedrock_fluid.gtceu.salt_water_deposit": "盐水矿藏", "behavior.data_item.data": "- §a%s", "behavior.data_item.title": "§n%s结构数据：", "behavior.item_magnet.disabled": "§c磁场已禁用", @@ -123,7 +115,7 @@ "behaviour.soft_hammer.enabled": "已恢复工作", "behaviour.soft_hammer.ignored": "机器无法被暂停", "behaviour.wrench": "右击以旋转方块", - "block.filter_casing.tooltip": "创建一个§a无尘§r环境", + "block.gtceu.filter_casing.tooltip": "创建一个§a无尘§r环境", "block.gtceu.acid_hazard_sign_block": "强酸危害警示方块", "block.gtceu.active_transformer": "有源变压器", "block.gtceu.advanced_computer_casing": "高级计算机外壳", @@ -828,7 +820,7 @@ "block.gtceu.me_pattern_buffer_proxy": "ME样板总成镜像", "block.gtceu.me_stocking_input_bus": "ME库存输入总线", "block.gtceu.me_stocking_input_hatch": "ME库存输入仓", - "block.gtceu.mega_blast_furnace": "转底炉", + "block.gtceu.rotary_hearth_furnace": "转底炉", "block.gtceu.mega_vacuum_freezer": "巨型真空冷冻机", "block.gtceu.miner_pipe": "采矿管道", "block.gtceu.mob_infestation_hazard_sign_block": "怪物侵袭危害警示方块", @@ -922,7 +914,6 @@ "block.gtceu.mv_wiremill": "§b进阶线材轧机§r", "block.gtceu.mv_world_accelerator": "§b进阶世界加速器§r", "block.gtceu.naquadah_coil_block": "硅岩线圈方块", - "block.gtceu.natural_gas": "天然气", "block.gtceu.network_switch": "网络交换机", "block.gtceu.nichrome_coil_block": "镍铬合金线圈方块", "block.gtceu.noise_hazard_sign_block": "噪声危害警示方块", @@ -1021,7 +1012,7 @@ "block.gtceu.orange_metal_sheet": "橙色金属板方块", "block.gtceu.orange_studs": "橙色橡胶混凝土", "block.gtceu.overworld_marker": "主世界", - "block.gtceu.palladium_substation": "镀钯变电站机械方块", + "block.gtceu.palladium_substation_casing": "镀钯变电站机械方块", "block.gtceu.pattern_buffer.desc.0": "§f对于GT多方块结构的集成式§6AE2样板供应器§f。", "block.gtceu.pattern_buffer.desc.1": "§fAE2样板可以利用§6共享库存§f中的一切。", "block.gtceu.pattern_buffer.desc.2": "§f使用§b闪存§f绑定§6ME样板总成镜像§f，以使机器相互连接！", @@ -1734,7 +1725,7 @@ "block.gtceu.zpm_transformer_4a": "§c零点压§r高流变压器（§cZPM§r）", "block.gtceu.zpm_wiremill": "§c精英线材轧机 III§r", "block.gtceu.zpm_world_accelerator": "§c精英世界加速器 III§r", - "block.sterilizing_filter_casing.tooltip": "创造一个§a无菌§r环境", + "block.gtceu.sterilizing_filter_casing.tooltip": "创造一个§a无菌§r环境", "block.gtceu.surface_rock": "地表岩石（%s）", "button.gtceu.mark_as_depleted.name": "标记为枯竭", "button.gtceu.toggle_waypoint.name": "切换路径点", @@ -2238,8 +2229,6 @@ "enchantment.gtceu.disjunction.description": "对末影生物施加虚弱和缓慢效果。", "enchantment.gtceu.hard_hammer.description": "像格雷科技的锤一样粉碎所采掘的方块。", "enchantment.hard_hammer": "锤碎", - "entity.gtceu.boat": "船", - "entity.gtceu.chest_boat": "运输船", "entity.gtceu.dynamite": "炸药", "entity.gtceu.industrial_tnt": "工业TNT", "entity.gtceu.powderbarrel": "火药桶", @@ -2249,19 +2238,10 @@ "fluid.tile.lava": "熔岩", "fluid.tile.water": "水", "fluid_cell.empty": "空", - "gtceu.air_scrubber": "空气净化器", - "gtceu.alloy_blast_smelter": "合金冶炼炉", - "gtceu.alloy_smelter": "合金炉", - "gtceu.arc_furnace": "电弧炉", - "gtceu.assembler": "组装机", - "gtceu.assembly_line": "装配线", "gtceu.auto_decomp.rotor": "涡轮转子", "gtceu.auto_decomp.tool": "非电动工具", - "gtceu.autoclave": "高压釜", "gtceu.battery_buffer.average_input": "平均输入：%s EU/t", "gtceu.battery_buffer.average_output": "平均输出：%s EU/t", - "gtceu.bender": "卷板机", - "gtceu.brewery": "酿造室", "gtceu.bus.collapse.error": "总线位于已成型的多方块结构后方可进行该操作", "gtceu.bus.collapse_false": "已禁用物品堆叠自动合并", "gtceu.bus.collapse_true": "已启用物品堆叠自动合并", @@ -2273,7 +2253,6 @@ "gtceu.cable.loss_per_block": "§c线损/米/安：§r§c%d§7 伏", "gtceu.cable.superconductor": "%s§d超导体", "gtceu.cable.voltage": "§a最大电压：§r§a%d§a（%s§a）", - "gtceu.canner": "装罐机", "gtceu.central_monitor.gui.create_group": "创建组", "gtceu.central_monitor.gui.currently_editing": "当前编辑：%s", "gtceu.central_monitor.gui.data_slot": "设置闪存的插槽号", @@ -2292,19 +2271,12 @@ "gtceu.central_monitor.info_tooltip.7": "将覆盖板装在目标方块上，使用闪存右键点击绑定，并放入多方块结构的数据访问仓内。", "gtceu.central_monitor.info_tooltip.8": "然后选择数据访问仓作为目标，并在弹出的数字栏中设为闪存所在的插槽的索引编号。", "gtceu.central_monitor.size": "尺寸：（%d+1+%d）x（%d+1+%d）", - "gtceu.centrifuge": "离心机", "gtceu.chance_logic.and": "AND", "gtceu.chance_logic.first": "第一", "gtceu.chance_logic.none": "NONE", "gtceu.chance_logic.or": "OR", "gtceu.chance_logic.xor": "XOR", "gtceu.chat.cape": "§5恭喜你：你刚刚解锁了一件新披风！查看终端应用程序“披风选择器”来使用它。§r", - "gtceu.chemical_bath": "化学浸洗机", - "gtceu.chemical_reactor": "化学反应釜", - "gtceu.circuit_assembler": "电路组装机", - "gtceu.coke_oven": "焦炉", - "gtceu.combustion_generator": "内燃发电机", - "gtceu.compressor": "压缩机", "gtceu.computer_monitor_cover.error.bf_invalid": "无效字符位于%d", "gtceu.computer_monitor_cover.error.bf_invalid_num": "处理符号编号%2$d时，索引%1$d处的数无效。", "gtceu.computer_monitor_cover.error.exception": "发生了意外异常：%s", @@ -2330,7 +2302,6 @@ "gtceu.cover.fluid_detector.message_fluid_storage_normal": "正在以普通模式监控流体存储", "gtceu.cover.item_detector.message_item_storage_inverted": "正在以反相模式监控物品存储", "gtceu.cover.item_detector.message_item_storage_normal": "正在以普通模式监控物品存储", - "gtceu.cracker": "裂化机", "gtceu.creative.activity.off": "未激活", "gtceu.creative.activity.on": "已激活", "gtceu.creative.chest.ipc": "每次输出物品数", @@ -2348,7 +2319,6 @@ "gtceu.creative_tooltip.1": "§7你需要", "gtceu.creative_tooltip.2": "§b创造模式", "gtceu.creative_tooltip.3": "§7来使用它", - "gtceu.cutter": "切割机", "gtceu.debug.f3_h.enabled": "格雷科技修改了调试信息！对于开发人员：在GregTech配置文件中启用misc:debug以查看更多信息", "gtceu.direction.tooltip.back": "背面", "gtceu.direction.tooltip.down": "底面", @@ -2358,22 +2328,12 @@ "gtceu.direction.tooltip.up": "顶面", "gtceu.display_source.computer_monitor_cover": "电脑屏幕覆盖板", "gtceu.display_target.computer_monitor_cover": "电脑屏幕覆盖板", - "gtceu.distillation_tower": "蒸馏塔", - "gtceu.distillery": "蒸馏室", "gtceu.duct_pipe.transfer_rate": "§b空气传输速率：%s", - "gtceu.dummy": "占位符", - "gtceu.electric_blast_furnace": "电力高炉", - "gtceu.electric_furnace": "电炉", - "gtceu.electrolyzer": "电解机", - "gtceu.electromagnetic_separator": "电磁选矿机", "gtceu.ender_item_link_cover.title": "末影物品连接", "gtceu.ender_item_link_cover.tooltip": "作§f覆盖板§7时利用§f无线§7§d末影§f连接§7传输§f物品§7。", "gtceu.ender_redstone_link_cover.label": "红石信号强度：%d", "gtceu.ender_redstone_link_cover.title": "末影红石连接", "gtceu.ender_redstone_link_cover.tooltip": "作§f覆盖板§7时利用§f无线§7§d末影§f连接§7传输§f红石信号§7。", - "gtceu.extractor": "提取机", - "gtceu.extruder": "压模器", - "gtceu.fermenter": "发酵槽", "gtceu.fluid.amount": "§9总量：%d/%d mB", "gtceu.fluid.click_combined": "§7手持流体容器点击流体槽以§c倒出§7或§b填入§7流体（Shift+单击以用整组容器倒出流体或用整组容器中的流体填入）", "gtceu.fluid.click_to_empty": "§7手持流体容器点击流体槽以§c倒出§7流体（Shift+单击以用整组容器倒出流体）", @@ -2391,7 +2351,6 @@ "gtceu.fluid.temperature": "§c温度：%s", "gtceu.fluid.temperature.cryogenic": "§b低温流体！轻拿轻放！", "gtceu.fluid.type_acid.tooltip": "§6酸性流体！轻拿轻放！", - "gtceu.fluid_heater": "流体加热器", "gtceu.fluid_pipe.acid_proof": "§6可传输酸性物质", "gtceu.fluid_pipe.capacity": "§9容积：§f%d mB", "gtceu.fluid_pipe.channels": "§e并行管道：§f%d", @@ -2400,15 +2359,9 @@ "gtceu.fluid_pipe.max_temperature": "§c温度上限：§f%s", "gtceu.fluid_pipe.not_gas_proof": "§4气体可能泄漏！", "gtceu.fluid_pipe.plasma_proof": "§6可传输所有等离子体", - "gtceu.fluid_solidifier": "流体固化器", - "gtceu.forge_hammer": "锻造锤", - "gtceu.forming_press": "冲压机床", "gtceu.forming_press.naming.named": "§o已命名物品", "gtceu.forming_press.naming.press": "§o名称模板", "gtceu.forming_press.naming.to_name": "§o待命名物品", - "gtceu.fusion_reactor": "核聚变反应堆", - "gtceu.gas_collector": "集气室", - "gtceu.gas_turbine": "燃气轮机", "gtceu.gui.adv_stocking_config.min_fluid_count": "自动拉取的最小流体量", "gtceu.gui.adv_stocking_config.min_item_count": "自动拉取的最小物品量", "gtceu.gui.adv_stocking_config.ticks_per_cycle": "物品列表更新之间的延迟", @@ -2594,14 +2547,14 @@ "gtceu.jade.remaining_discharge_time": "预计耗空时间：%s", "gtceu.jade.seconds": "%s秒", "gtceu.jade.years": "%s年", - "gtceu.jei.bedrock_fluid.heavy_oil_deposit": "重油矿藏", - "gtceu.jei.bedrock_fluid.lava_deposit": "熔岩矿藏", - "gtceu.jei.bedrock_fluid.light_oil_deposit": "轻油矿藏", - "gtceu.jei.bedrock_fluid.natural_gas_deposit": "天然气矿藏", - "gtceu.jei.bedrock_fluid.nether_natural_gas_deposit": "下界天然气矿藏", - "gtceu.jei.bedrock_fluid.oil_deposit": "石油矿藏", - "gtceu.jei.bedrock_fluid.raw_oil_deposit": "原油矿藏", - "gtceu.jei.bedrock_fluid.salt_water_deposit": "盐水矿藏", + "bedrock_fluid.gtceu.heavy_oil_deposit": "重油矿藏", + "bedrock_fluid.gtceu.lava_deposit": "熔岩矿藏", + "bedrock_fluid.gtceu.light_oil_deposit": "轻油矿藏", + "bedrock_fluid.gtceu.natural_gas_deposit": "天然气矿藏", + "bedrock_fluid.gtceu.nether_natural_gas_deposit": "下界天然气矿藏", + "bedrock_fluid.gtceu.oil_deposit": "石油矿藏", + "bedrock_fluid.gtceu.raw_oil_deposit": "原油矿藏", + "bedrock_fluid.gtceu.salt_water_deposit": "盐水矿藏", "gtceu.jei.bedrock_fluid_diagram": "基岩流体生成信息", "gtceu.jei.bedrock_ore_diagram": "基岩矿脉生成信息", "gtceu.jei.bedrock_vein_diagram.depleted": "已枯竭：%s", @@ -2638,46 +2591,46 @@ "gtceu.jei.ore.surface_rock.0": "这种地表岩石标志着矿脉的生成位置。", "gtceu.jei.ore.surface_rock.1": "挖掘掉落3小撮粉受时运加成", "gtceu.jei.ore_processing_diagram": "矿物处理流程图", - "gtceu.jei.ore_vein.apatite_vein": "磷灰石矿脉", - "gtceu.jei.ore_vein.banded_iron_vein": "带状铁矿脉", - "gtceu.jei.ore_vein.bauxite_vein_end": "末地铝土矿脉", - "gtceu.jei.ore_vein.beryllium_vein": "铍矿脉", - "gtceu.jei.ore_vein.cassiterite_vein": "锡石矿脉", - "gtceu.jei.ore_vein.certus_quartz": "赛特斯石英", - "gtceu.jei.ore_vein.coal_vein": "煤炭矿脉", - "gtceu.jei.ore_vein.copper_tin_vein": "铜锡矿脉", - "gtceu.jei.ore_vein.copper_vein": "铜矿脉", - "gtceu.jei.ore_vein.diamond_vein": "钻石矿脉", - "gtceu.jei.ore_vein.galena_vein": "方铅矿脉", - "gtceu.jei.ore_vein.garnet_tin_vein": "锡石榴石矿脉", - "gtceu.jei.ore_vein.garnet_vein": "石榴石矿脉", - "gtceu.jei.ore_vein.iron_vein": "铁矿脉", - "gtceu.jei.ore_vein.lapis_vein": "青金石矿脉", - "gtceu.jei.ore_vein.lubricant_vein": "皂滑矿脉", - "gtceu.jei.ore_vein.magnetite_vein_end": "末地磁铁矿脉", - "gtceu.jei.ore_vein.magnetite_vein_ow": "主世界磁铁矿脉", - "gtceu.jei.ore_vein.manganese_vein": "锰矿脉", - "gtceu.jei.ore_vein.manganese_vein_ow": "主世界锰矿脉", - "gtceu.jei.ore_vein.mica_vein": "云母矿脉", - "gtceu.jei.ore_vein.mineral_sand_vein": "矿砂矿脉", - "gtceu.jei.ore_vein.molybdenum_vein": "钼矿脉", - "gtceu.jei.ore_vein.monazite_vein": "独居石矿脉", - "gtceu.jei.ore_vein.naquadah_vein": "硅岩矿脉", - "gtceu.jei.ore_vein.nether_quartz_vein": "下界石英矿脉", - "gtceu.jei.ore_vein.nickel_vein": "镍矿脉", - "gtceu.jei.ore_vein.oilsands_vein": "油砂矿脉", - "gtceu.jei.ore_vein.olivine_vein": "橄榄石矿脉", - "gtceu.jei.ore_vein.pitchblende_vein_end": "末地沥青铀矿脉", - "gtceu.jei.ore_vein.redstone_vein": "红石矿脉", - "gtceu.jei.ore_vein.redstone_vein_ow": "主世界红石矿脉", - "gtceu.jei.ore_vein.saltpeter_vein": "硝石矿脉", - "gtceu.jei.ore_vein.salts_vein": "盐矿脉", - "gtceu.jei.ore_vein.sapphire_vein": "蓝宝石矿脉", - "gtceu.jei.ore_vein.scheelite_vein": "白钨矿脉", - "gtceu.jei.ore_vein.sheldonite_vein": "谢尔顿矿脉", - "gtceu.jei.ore_vein.sulfur_vein": "硫矿脉", - "gtceu.jei.ore_vein.tetrahedrite_vein": "黝铜矿脉", - "gtceu.jei.ore_vein.topaz_vein": "黄玉矿脉", + "ore_vein.gtceu.apatite": "磷灰石", + "ore_vein.gtceu.banded_iron": "带状铁", + "ore_vein.gtceu.end_bauxite": "末地铝土", + "ore_vein.gtceu.beryllium": "铍", + "ore_vein.gtceu.cassiterite": "锡石", + "ore_vein.gtceu.certus_quartz": "赛特斯石英", + "ore_vein.gtceu.coal": "煤炭", + "ore_vein.gtceu.copper_tin": "铜锡", + "ore_vein.gtceu.copper": "铜", + "ore_vein.gtceu.diamond": "钻石", + "ore_vein.gtceu.galena": "方铅", + "ore_vein.gtceu.garnet_tin": "锡石榴石", + "ore_vein.gtceu.garnet": "石榴石", + "ore_vein.gtceu.iron": "铁", + "ore_vein.gtceu.lapis": "青金石", + "ore_vein.gtceu.lubricant": "皂滑", + "ore_vein.gtceu.end_magnetite": "末地磁铁", + "ore_vein.gtceu.magnetite": "主世界磁铁", + "ore_vein.gtceu.nether_manganese": "锰", + "ore_vein.gtceu.manganese": "主世界锰", + "ore_vein.gtceu.mica": "云母", + "ore_vein.gtceu.mineral_sand": "矿砂", + "ore_vein.gtceu.molybdenum": "钼", + "ore_vein.gtceu.monazite": "独居石", + "ore_vein.gtceu.naquadah": "硅岩", + "ore_vein.gtceu.nether_quartz": "下界石英", + "ore_vein.gtceu.nickel": "镍", + "ore_vein.gtceu.oilsands": "油砂", + "ore_vein.gtceu.olivine": "橄榄石", + "ore_vein.gtceu.pitchblende": "末地沥青铀", + "ore_vein.gtceu.nether_redstone": "红石", + "ore_vein.gtceu.redstone": "主世界红石", + "ore_vein.gtceu.saltpeter": "硝石", + "ore_vein.gtceu.salts": "盐", + "ore_vein.gtceu.sapphire": "蓝宝石", + "ore_vein.gtceu.scheelite": "白钨", + "ore_vein.gtceu.sheldonite": "谢尔顿", + "ore_vein.gtceu.sulfur": "硫", + "ore_vein.gtceu.tetrahedrite": "黝铜", + "ore_vein.gtceu.topaz": "黄玉", "gtceu.jei.ore_vein_diagram": "矿脉生成信息", "gtceu.jei.ore_vein_diagram.chance": "§e概率：%s§r", "gtceu.jei.ore_vein_diagram.dimensions": "维度：", @@ -2692,11 +2645,6 @@ "gtceu.key.enable_jetpack": "启用喷气背包", "gtceu.key.enable_step_assist": "启用步行辅助", "gtceu.key.tool_aoe_change": "切换工具范围模式", - "gtceu.large_boiler": "大型锅炉", - "gtceu.large_chemical_reactor": "大型化学反应釜", - "gtceu.laser_engraver": "激光蚀刻机", - "gtceu.lathe": "车床", - "gtceu.macerator": "研磨机", "gtceu.machine.active_transformer.tooltip.0": "§7变形金刚：伪装的激光", "gtceu.machine.active_transformer.tooltip.1": "§7可以将任意数量的能量§f输入§7整合为任意数量的能量§f输出§7。", "gtceu.machine.active_transformer.tooltip.2": "§7当你使用§d激光§7进行能量传输时，拥有惊人的传输距离。", @@ -3566,11 +3514,9 @@ "gtceu.oc.tooltip.2": "右键单击降低超频等级", "gtceu.oc.tooltip.3": "中键单击重设超频等级", "gtceu.oc.tooltip.4": "按住Shift以无损超频显示", - "gtceu.ore_washer": "洗矿厂", "gtceu.ownership.name.argonauts": "Argonauts公会", "gtceu.ownership.name.ftb": "FTB团队", "gtceu.ownership.name.player": "玩家", - "gtceu.packer": "打包机", "gtceu.part_sharing.disabled": "多方块结构共享：§4禁止", "gtceu.part_sharing.enabled": "多方块结构共享：§a允许", "gtceu.pattern_error.mismatch_coils": "线圈不匹配：%s与%s在（%d，%d，%d）", @@ -3805,14 +3751,6 @@ "gtceu.predicate_error.steam.missing_steam_hatch": "缺少蒸汽仓", "gtceu.provider.computer_monitor_cover.error.no_target": "未为监控器组选择目标", "gtceu.recipe.byproduct_tier": "%s§r+时有副产品", - "gtceu.recipe.category.arc_furnace_recycling": "电弧炉：回收", - "gtceu.recipe.category.chem_dyes": "化学浸洗机：化学染色", - "gtceu.recipe.category.extractor_recycling": "流体提取机：重熔回收", - "gtceu.recipe.category.ingot_molding": "合金炉：金属成型", - "gtceu.recipe.category.macerator_recycling": "研磨机：粉碎回收", - "gtceu.recipe.category.ore_bathing": "化学浸洗机：矿物处理", - "gtceu.recipe.category.ore_crushing": "研磨机：矿物处理", - "gtceu.recipe.category.ore_forging": "锻造锤：矿物处理", "gtceu.recipe.chance": "概率：%s + %s/电压等级", "gtceu.recipe.cleanroom": "需要%s", "gtceu.recipe.cleanroom.display_name": "超净间", @@ -3853,15 +3791,9 @@ "gtceu.recipe_modifier.insufficient_voltage": "电压等级不足", "gtceu.recipe_type.show_recipes": "查看配方", "gtceu.rei.group.potion_fluids": "药水流体", - "gtceu.research_station": "研究站", - "gtceu.rock_breaker": "碎岩机", - "gtceu.scanner": "扫描仪", "gtceu.scanner.copy_stick_empty": "§o空闪存", "gtceu.scanner.copy_stick_from": "§o要复制的闪存", "gtceu.scanner.copy_stick_to": "§o闪存（已复制）", - "gtceu.sifter": "筛选机", - "gtceu.steam_boiler": "蒸汽锅炉", - "gtceu.steam_turbine": "蒸汽涡轮", "gtceu.subtitle.arc": "电弧炉：嗡——", "gtceu.subtitle.assembler": "组装机：运行中", "gtceu.subtitle.bath": "化学浸洗机：嘶嘶", @@ -3901,7 +3833,6 @@ "gtceu.subtitle.turbine": "涡轮：呼啸", "gtceu.subtitle.wirecutter": "剪线钳：剪断", "gtceu.subtitle.wrench": "扳手：嘎啦", - "gtceu.thermal_centrifuge": "热力离心机", "gtceu.tool.class.axe": "斧", "gtceu.tool.class.butchery_knife": "屠刀", "gtceu.tool.class.crowbar": "撬棍", @@ -4055,8 +3986,6 @@ "gtceu.universal.tooltip.working_area_chunks": "§b工作范围：§f%dx%d 区块", "gtceu.universal.tooltip.working_area_chunks_max": "§b最大工作范围：§f%dx%d 区块", "gtceu.universal.tooltip.working_area_max": "§b最大工作范围：§f%dx%d", - "gtceu.vacuum_freezer": "真空冷冻机", - "gtceu.wiremill": "线材轧机", "gui.gtceu.refund_all.desc": "将共享库存返还到AE2", "gui.gtceu.rename.desc": "重命名样板总成", "gui.gtceu.share_inventory.desc.0": "与总成内的所有样板共享物品！", @@ -4312,11 +4241,11 @@ "item.gtceu.fullers_earth_dust": "漂白土", "item.gtceu.garnet_sand_dust": "石榴石砂", "item.gtceu.gear_casting_mold": "模具（齿轮）", - "item.gtceu.gear_casting_mold.small.tooltip": "§7用来制作小型齿轮的模具", + "item.gtceu.small_gear_casting_mold.tooltip": "§7用来制作小型齿轮的模具", "item.gtceu.gear_casting_mold.tooltip": "§7用来制作齿轮的模具", "item.gtceu.gear_extruder_mold": "模头（齿轮）", "item.gtceu.gear_extruder_mold.tooltip": "§7用来制作齿轮的模头", - "item.gtceu.gear_small_extruder_mold.tooltip": "§7用来制作小型齿轮的模头", + "item.gtceu.small_gear_extruder_mold.tooltip": "§7用来制作小型齿轮的模头", "item.gtceu.gelled_toluene": "胶凝甲苯", "item.gtceu.gelled_toluene.tooltip": "§7炸药原料", "item.gtceu.glass_gem": "玻璃晶体", @@ -4406,9 +4335,9 @@ "item.gtceu.item_filter": "物品过滤卡", "item.gtceu.item_filter.tooltip.0": "§7作§f覆盖板§7时过滤§f物品§7的输入/输出。", "item.gtceu.item_filter.tooltip.1": "亦可为§f传送带§7和§f机械臂§7提供此功能。", - "item.gtceu.item_smart_filter": "智能物品过滤卡", - "item.gtceu.item_smart_filter.tooltip.0": "§7作§f覆盖板§7时以§f机器的配方§7过滤§f物品§7的输入/输出。", - "item.gtceu.item_smart_filter.tooltip.1": "亦可为§f传送带§7和§f机械臂§7提供此功能。", + "item.gtceu.smart_item_filter": "智能物品过滤卡", + "item.gtceu.smart_item_filter.tooltip.0": "§7作§f覆盖板§7时以§f机器的配方§7过滤§f物品§7的输入/输出。", + "item.gtceu.smart_item_filter.tooltip.1": "亦可为§f传送带§7和§f机械臂§7提供此功能。", "item.gtceu.item_tag_filter": "物品标签过滤卡", "item.gtceu.item_tag_filter.tooltip.0": "§7作§f覆盖板§7时以§f物品标签§7过滤§f物品§7的输入/输出。", "item.gtceu.item_tag_filter.tooltip.1": "亦可为§f传送带§7和§f机械臂§7提供此功能。", @@ -4631,16 +4560,16 @@ "item.gtceu.pill_casting_mold": "模具（药片）", "item.gtceu.pink_dye_spray_can": "喷漆罐（粉红色）", "item.gtceu.pink_glass_lens": "玻璃透镜（粉红色）", - "item.gtceu.pipe.huge_casting_mold.tooltip": "§7用来制作巨型管道的模具", - "item.gtceu.pipe.huge_extruder_mold.tooltip": "§7用来制作巨型管道的模头", - "item.gtceu.pipe.large_casting_mold.tooltip": "§7用来制作大型管道的模具", - "item.gtceu.pipe.large_extruder_mold.tooltip": "§7用来制作大型管道的模头", - "item.gtceu.pipe.normal_casting_mold.tooltip": "§7用来制作管道的模具", - "item.gtceu.pipe.normal_extruder_mold.tooltip": "§7用来制作管道的模头", - "item.gtceu.pipe.small_casting_mold.tooltip": "§7用来制作小型管道的模具", - "item.gtceu.pipe.small_extruder_mold.tooltip": "§7用来制作小型管道的模头", - "item.gtceu.pipe.tiny_casting_mold.tooltip": "§7用来制作微型管道的模具", - "item.gtceu.pipe.tiny_extruder_mold.tooltip": "§7用来制作微型管道的模头", + "item.gtceu.huge_pipe_casting_mold.tooltip": "§7用来制作巨型管道的模具", + "item.gtceu.huge_pipe_extruder_mold.tooltip": "§7用来制作巨型管道的模头", + "item.gtceu.large_pipe_casting_mold.tooltip": "§7用来制作大型管道的模具", + "item.gtceu.large_pipe_extruder_mold.tooltip": "§7用来制作大型管道的模头", + "item.gtceu.normal_pipe_casting_mold.tooltip": "§7用来制作管道的模具", + "item.gtceu.normal_pipe_extruder_mold.tooltip": "§7用来制作管道的模头", + "item.gtceu.small_pipe_casting_mold.tooltip": "§7用来制作小型管道的模具", + "item.gtceu.small_pipe_extruder_mold.tooltip": "§7用来制作小型管道的模头", + "item.gtceu.tiny_pipe_casting_mold.tooltip": "§7用来制作微型管道的模具", + "item.gtceu.tiny_pipe_extruder_mold.tooltip": "§7用来制作微型管道的模头", "item.gtceu.pitchblende_dust": "沥青铀矿", "item.gtceu.plant_ball": "植物球", "item.gtceu.plastic_circuit_board": "塑料电路基板", @@ -4733,7 +4662,7 @@ "item.gtceu.rock_salt_dust": "岩盐", "item.gtceu.rod_extruder_mold": "模头（杆）", "item.gtceu.rod_extruder_mold.tooltip": "§7用来制作杆的模头", - "item.gtceu.rod_long_extruder_mold.tooltip": "§7用来制作长杆的模头", + "item.gtceu.long_rod_extruder_mold.tooltip": "§7用来制作长杆的模头", "item.gtceu.rotor_casting_mold": "模具（转子）", "item.gtceu.rotor_casting_mold.tooltip": "§7用来制作转子的模具", "item.gtceu.rotor_extruder_mold": "模头（转子）", @@ -5348,7 +5277,7 @@ "material.gtceu.goethite": "针铁矿", "material.gtceu.gold": "金", "material.gtceu.granite": "花岗岩", - "material.gtceu.granite_red": "红花岗岩", + "material.gtceu.red_granite": "红花岗岩", "material.gtceu.granitic_mineral_sand": "花岗岩矿砂", "material.gtceu.graphene": "石墨烯", "material.gtceu.graphite": "石墨", @@ -5518,9 +5447,9 @@ "material.gtceu.octane": "辛烷", "material.gtceu.oganesson": "鿫", "material.gtceu.oil": "石油", - "material.gtceu.oil_heavy": "重油", - "material.gtceu.oil_light": "轻油", - "material.gtceu.oil_medium": "原油", + "material.gtceu.heavy_oil": "重油", + "material.gtceu.light_oil": "轻油", + "material.gtceu.raw_oil": "原油", "material.gtceu.oilsands": "油砂", "material.gtceu.olivine": "橄榄石", "material.gtceu.opal": "猫眼石", @@ -5548,7 +5477,7 @@ "material.gtceu.platinum_group_sludge": "铂系矿泥", "material.gtceu.platinum_raw": "粗铂", "material.gtceu.platinum_sludge_residue": "铂泥渣", - "material.gtceu.plutonium": "钚", + "material.gtceu.plutonium_239": "钚-239", "material.gtceu.plutonium_241": "钚-241", "material.gtceu.pollucite": "铯榴石", "material.gtceu.polonium": "钋", @@ -5732,7 +5661,7 @@ "material.gtceu.tungstic_acid": "钨酸", "material.gtceu.ultimet": "哈氏合金", "material.gtceu.uraninite": "晶质铀矿", - "material.gtceu.uranium": "铀", + "material.gtceu.uranium_238": "铀-238", "material.gtceu.uranium_235": "铀-235", "material.gtceu.uranium_hexafluoride": "六氟化铀", "material.gtceu.uranium_rhodium_dinaquadide": "铀铑硅岩合金", @@ -5990,7 +5919,7 @@ "tagprefix.blackstone": "黑石%s矿石", "tagprefix.block": "%s块", "tagprefix.bolt": "%s螺栓", - "tagprefix.buzz_saw_blade": "%s圆锯锯片", + "tagprefix.buzzsaw_blade": "%s圆锯锯片", "tagprefix.cable_gt_double": "2x%s线缆", "tagprefix.cable_gt_hex": "16x%s线缆", "tagprefix.cable_gt_octal": "8x%s线缆", diff --git a/src/main/resources/assets/gtceu/lang/zh_tw.json b/src/main/resources/assets/gtceu/lang/zh_tw.json index 703e72bb6b9..7391c0b6eb2 100644 --- a/src/main/resources/assets/gtceu/lang/zh_tw.json +++ b/src/main/resources/assets/gtceu/lang/zh_tw.json @@ -108,7 +108,7 @@ "behaviour.soft_hammer.disabled_cycle": "本執行週期後暫停工作", "behaviour.soft_hammer.enabled": "已恢復工作", "behaviour.wrench": "右擊以旋轉方塊", - "block.filter_casing.tooltip": "建立一個§a無塵§r環境", + "block.gtceu.filter_casing.tooltip": "建立一個§a無塵§r環境", "block.gtceu.acid_hazard_sign_block": "強酸危害警示方塊", "block.gtceu.active_transformer": "有源變壓器", "block.gtceu.advanced_computer_casing": "高階電腦外殼", @@ -812,7 +812,7 @@ "block.gtceu.me_pattern_buffer_proxy": "ME遠端樣板供應倉", "block.gtceu.me_stocking_input_bus": "ME庫存輸入匯流排", "block.gtceu.me_stocking_input_hatch": "ME庫存輸入倉", - "block.gtceu.mega_blast_furnace": "轉底爐", + "block.gtceu.rotary_hearth_furnace": "轉底爐", "block.gtceu.mega_vacuum_freezer": "巨型真空冷凍機", "block.gtceu.miner_pipe": "採礦管道", "block.gtceu.mob_infestation_hazard_sign_block": "怪物侵襲危害警示方塊", @@ -1004,7 +1004,7 @@ "block.gtceu.orange_metal_sheet": "橙色金屬板方塊", "block.gtceu.orange_studs": "橙色橡膠混凝土", "block.gtceu.overworld_marker": "主世界", - "block.gtceu.palladium_substation": "鍍鈀變電站機械方塊", + "block.gtceu.palladium_substation_casing": "鍍鈀變電站機械方塊", "block.gtceu.pattern_buffer.desc.0": "§f多方塊結構的整合式§6AE2樣板供應器§f。", "block.gtceu.pattern_buffer.desc.1": "§fAE2樣板可以利用§6共享庫存§f中的一切。", "block.gtceu.pattern_buffer.desc.2": "§f使用§b快閃記憶體§f綁定§6ME遠端樣板供應倉§f，以使機器相互連線！", @@ -1716,7 +1716,7 @@ "block.gtceu.zpm_transformer_4a": "§c零點壓§r高流變壓器（§cZPM§r）", "block.gtceu.zpm_wiremill": "§c精英線材軋機 III§r", "block.gtceu.zpm_world_accelerator": "§c精英世界加速器 III§r", - "block.sterilizing_filter_casing.tooltip": "創造一個§a無菌§r環境", + "block.gtceu.sterilizing_filter_casing.tooltip": "創造一個§a無菌§r環境", "block.gtceu.surface_rock": "地表岩石（%s）", "button.gtceu.mark_as_depleted.name": "標記為枯竭", "button.gtceu.toggle_waypoint.name": "切換路徑點", @@ -1740,7 +1740,6 @@ "command.gtceu.share_prospection_data.notification": "%s與你分享了礦脈資料！", "config.gtceu.option.addLoot": "新增戰利品", "config.gtceu.option.ae2": "ae2", - "config.gtceu.option.allowDrumsInputFluidsFromOutputSide": "允許桶從輸出面輸入流體", "config.gtceu.option.allowedImageDomains": "圖片域名白名單", "config.gtceu.option.animationTime": "動畫時間", "config.gtceu.option.arcRecyclingYield": "電弧爐回收率", @@ -2083,7 +2082,6 @@ "cover.pump.mode.import": "模式：輸入", "cover.pump.title": "泵覆蓋板設定（%s）", "cover.pump.transfer_rate": "%s", - "cover.robotic_arm.title": "機械臂設定（%s）", "cover.robotic_arm.transfer_mode.description.0": "§e任意傳輸§r-在此模式下，覆蓋板將儘可能傳輸一切符合過濾設定的物品。", "cover.robotic_arm.transfer_mode.description.1": "§e精確補給§r-在此模式下，覆蓋板每次都會輸入在物品過濾卡的過濾槽中指定（或者在標籤過濾卡的按鈕裡指定）數量的物品。若物品的數量小於指定數量，物品將不會被輸入。", "cover.robotic_arm.transfer_mode.description.2": "§e保持補給§r-在此模式下，覆蓋板將保持目標容器中指定物品的數量，需要物品時則供應相應量的物品。", @@ -2138,8 +2136,6 @@ "death.attack.gtceu.drill_lv": "%2$s的低壓電鑽洞穿了%1$s", "death.attack.gtceu.drill_mv": "%2$s的中壓電鑽洞穿了%1$s", "death.attack.gtceu.electric": "%s觸電身亡", - "death.attack.gtceu.explosion": "%s爆炸了", - "death.attack.gtceu.explosion.player": "拜%2$s所賜，%1$s爆炸了", "death.attack.gtceu.file": "%s歷盡了%s的“銼”折", "death.attack.gtceu.frost": "%s探索到了低溫的奧秘", "death.attack.gtceu.hammer": "%s被%s錘死了", @@ -2182,8 +2178,6 @@ "enchantment.gtceu.disjunction.description": "對終界生物施加虛弱和緩慢效果。", "enchantment.gtceu.hard_hammer.description": "像格雷科技的錘一樣粉碎所採掘的方塊。", "enchantment.hard_hammer": "錘碎", - "entity.gtceu.boat": "船", - "entity.gtceu.chest_boat": "儲物箱船", "entity.gtceu.dynamite": "炸藥", "entity.gtceu.industrial_tnt": "工業TNT", "entity.gtceu.powderbarrel": "火藥桶", @@ -2193,19 +2187,19 @@ "fluid.tile.lava": "熔岩", "fluid.tile.water": "水", "fluid_cell.empty": "空", - "gtceu.air_scrubber": "空氣淨化器", - "gtceu.alloy_blast_smelter": "合金冶煉爐", - "gtceu.alloy_smelter": "合金冶煉", - "gtceu.arc_furnace": "電弧爐", - "gtceu.assembler": "組裝機", - "gtceu.assembly_line": "裝配線", + "recipe_type.gtceu.air_scrubber": "空氣淨化器", + "recipe_type.gtceu.alloy_blast_smelter": "合金冶煉爐", + "recipe_type.gtceu.alloy_smelter": "合金冶煉", + "recipe_type.gtceu.arc_furnace": "電弧爐", + "recipe_type.gtceu.assembler": "組裝機", + "recipe_type.gtceu.assembly_line": "裝配線", "gtceu.auto_decomp.rotor": "渦輪轉子", "gtceu.auto_decomp.tool": "非電動工具", - "gtceu.autoclave": "高壓釜", + "recipe_type.gtceu.autoclave": "高壓釜", "gtceu.battery_buffer.average_input": "平均輸入：%s EU/t", "gtceu.battery_buffer.average_output": "平均輸出：%s EU/t", - "gtceu.bender": "卷板機", - "gtceu.brewery": "釀造室", + "recipe_type.gtceu.bender": "卷板機", + "recipe_type.gtceu.brewery": "釀造室", "gtceu.bus.collapse.error": "匯流排位於已成型的多方塊結構後方可進行該操作", "gtceu.bus.collapse_false": "已禁用物品堆疊自動合併", "gtceu.bus.collapse_true": "已啟用物品堆疊自動合併", @@ -2217,7 +2211,7 @@ "gtceu.cable.loss_per_block": "§c線損/公尺/安：§r§c%d§7 伏", "gtceu.cable.superconductor": "%s§d超導體", "gtceu.cable.voltage": "§a最大電壓：§r§a%d§a（%s§a）", - "gtceu.canner": "裝罐機", + "recipe_type.gtceu.canner": "裝罐機", "gtceu.central_monitor.gui.create_group": "建立群組", "gtceu.central_monitor.gui.currently_editing": "當前編輯：%s", "gtceu.central_monitor.gui.remove_from_group": "從群組中移除", @@ -2232,19 +2226,19 @@ "gtceu.central_monitor.info_tooltip.7": "將覆蓋板裝在目標方塊上，使用快閃記憶體右鍵點選綁定，並放入多方塊結構的資料訪問倉內。", "gtceu.central_monitor.info_tooltip.8": "然後選擇資料訪問倉作為目標，並在彈出的數字欄中設為快閃記憶體所在的插槽的索引編號。", "gtceu.central_monitor.size": "尺寸：（%d+1+%d）x（%d+1+%d）", - "gtceu.centrifuge": "離心機", + "recipe_type.gtceu.centrifuge": "離心機", "gtceu.chance_logic.and": "AND", "gtceu.chance_logic.first": "第一", "gtceu.chance_logic.none": "NONE", "gtceu.chance_logic.or": "OR", "gtceu.chance_logic.xor": "XOR", "gtceu.chat.cape": "§5恭喜你：你剛剛解鎖了一件新披風！檢視終端應用程式“披風選擇器”來使用它。§r", - "gtceu.chemical_bath": "化學水浴機", - "gtceu.chemical_reactor": "化學反應器", - "gtceu.circuit_assembler": "電路組裝機", - "gtceu.coke_oven": "焦爐", - "gtceu.combustion_generator": "內燃發電機", - "gtceu.compressor": "壓縮機", + "recipe_type.gtceu.chemical_bath": "化學水浴機", + "recipe_type.gtceu.chemical_reactor": "化學反應器", + "recipe_type.gtceu.circuit_assembler": "電路組裝機", + "recipe_type.gtceu.coke_oven": "焦爐", + "recipe_type.gtceu.combustion_generator": "內燃發電機", + "recipe_type.gtceu.compressor": "壓縮機", "gtceu.computer_monitor_cover.error.bf_invalid": "無效字元位於%d", "gtceu.computer_monitor_cover.error.bf_invalid_num": "處理符號編號%2$d時，索引%1$d處的數無效。", "gtceu.computer_monitor_cover.error.exception": "發生了意外異常：%s", @@ -2270,7 +2264,7 @@ "gtceu.cover.fluid_detector.message_fluid_storage_normal": "正在以普通模式監控流體儲存", "gtceu.cover.item_detector.message_item_storage_inverted": "正在以反相模式監控物品儲存", "gtceu.cover.item_detector.message_item_storage_normal": "正在以普通模式監控物品儲存", - "gtceu.cracker": "裂解機", + "recipe_type.gtceu.cracker": "裂解機", "gtceu.creative.activity.off": "未啟用", "gtceu.creative.activity.on": "已啟用", "gtceu.creative.chest.ipc": "每次輸出流體量", @@ -2287,7 +2281,7 @@ "gtceu.creative_tooltip.1": "§7你需要", "gtceu.creative_tooltip.2": "§b創造模式", "gtceu.creative_tooltip.3": "§7來使用它", - "gtceu.cutter": "切割機", + "recipe_type.gtceu.cutter": "切割機", "gtceu.debug.f3_h.enabled": "格雷科技修改了除錯資訊！對於開發人員：在GregTech設定檔案中啟用misc:debug以檢視更多資訊", "gtceu.direction.tooltip.back": "背面", "gtceu.direction.tooltip.down": "底面", @@ -2297,22 +2291,22 @@ "gtceu.direction.tooltip.up": "頂面", "gtceu.display_source.computer_monitor_cover": "電腦螢幕覆蓋板", "gtceu.display_target.computer_monitor_cover": "電腦螢幕覆蓋板", - "gtceu.distillation_tower": "蒸餾塔", - "gtceu.distillery": "蒸餾室", + "recipe_type.gtceu.distillation_tower": "蒸餾塔", + "recipe_type.gtceu.distillery": "蒸餾室", "gtceu.duct_pipe.transfer_rate": "§b空氣傳輸速率：%s", - "gtceu.dummy": "假人", - "gtceu.electric_blast_furnace": "電力高爐", - "gtceu.electric_furnace": "電爐", - "gtceu.electrolyzer": "電解機", - "gtceu.electromagnetic_separator": "電磁分離機", + "recipe_type.gtceu.dummy": "假人", + "recipe_type.gtceu.electric_blast_furnace": "電力高爐", + "recipe_type.gtceu.electric_furnace": "電爐", + "recipe_type.gtceu.electrolyzer": "電解機", + "recipe_type.gtceu.electromagnetic_separator": "電磁分離機", "gtceu.ender_item_link_cover.title": "終界物品連線", "gtceu.ender_item_link_cover.tooltip": "作§f覆蓋板§7時利用§f無線§7§d終界§f連線§7傳輸§f物品§7。", "gtceu.ender_redstone_link_cover.label": "紅石訊號強度：%d", "gtceu.ender_redstone_link_cover.title": "終界紅石連線", "gtceu.ender_redstone_link_cover.tooltip": "作§f覆蓋板§7時利用§f無線§7§d終界§f連線§7傳輸§f紅石訊號§7。", - "gtceu.extractor": "提取機", - "gtceu.extruder": "壓模器", - "gtceu.fermenter": "發酵槽", + "recipe_type.gtceu.extractor": "提取機", + "recipe_type.gtceu.extruder": "壓模器", + "recipe_type.gtceu.fermenter": "發酵槽", "gtceu.fluid.amount": "§9總量：%d/%d mB", "gtceu.fluid.click_combined": "§7手持流體容器點選流體槽以§c倒出§7或§b填入§7流體（Shift+點擊以用整組容器倒出流體或用整組容器中的流體填入）", "gtceu.fluid.click_to_empty": "§7手持流體容器點選流體槽以§c倒出§7流體（Shift+點擊以用整組容器倒出流體）", @@ -2330,7 +2324,7 @@ "gtceu.fluid.temperature": "§c溫度：%d", "gtceu.fluid.temperature.cryogenic": "§b低溫流體！輕拿輕放！", "gtceu.fluid.type_acid.tooltip": "§6酸性流體！輕拿輕放！", - "gtceu.fluid_heater": "流體加熱器", + "recipe_type.gtceu.fluid_heater": "流體加熱器", "gtceu.fluid_pipe.acid_proof": "§6可傳輸酸性物質", "gtceu.fluid_pipe.capacity": "§9容積：§f%d mB", "gtceu.fluid_pipe.channels": "§e平行管道：§f%d", @@ -2339,15 +2333,15 @@ "gtceu.fluid_pipe.max_temperature": "§c溫度上限：§f%s", "gtceu.fluid_pipe.not_gas_proof": "§4氣體可能洩漏！", "gtceu.fluid_pipe.plasma_proof": "§6可傳輸所有電漿", - "gtceu.fluid_solidifier": "流體固化器", - "gtceu.forge_hammer": "鍛造錘", - "gtceu.forming_press": "衝壓機床", + "recipe_type.gtceu.fluid_solidifier": "流體固化器", + "recipe_type.gtceu.forge_hammer": "鍛造錘", + "recipe_type.gtceu.forming_press": "衝壓機床", "gtceu.forming_press.naming.named": "§o已命名物品", "gtceu.forming_press.naming.press": "§o名稱模板", "gtceu.forming_press.naming.to_name": "§o待命名物品", - "gtceu.fusion_reactor": "核融合反應爐", - "gtceu.gas_collector": "集氣室", - "gtceu.gas_turbine": "燃氣輪機", + "recipe_type.gtceu.fusion_reactor": "核融合反應爐", + "recipe_type.gtceu.gas_collector": "集氣室", + "recipe_type.gtceu.gas_turbine": "燃氣輪機", "gtceu.gui.adv_stocking_config.min_fluid_count": "自動拉取的最小流體量", "gtceu.gui.adv_stocking_config.min_item_count": "自動拉取的最小物品量", "gtceu.gui.adv_stocking_config.ticks_per_cycle": "物品列表更新之間的延遲", @@ -2492,7 +2486,7 @@ "tooltip.gtceu.hazard_trigger.none": "無", "tooltip.gtceu.hazard_trigger.protection": "免受：", "tooltip.gtceu.hazard_trigger.skin_contact": "皮膚接觸", - "gtceu.implosion_compressor": "聚爆壓縮機", + "recipe_type.gtceu.implosion_compressor": "聚爆壓縮機", "gtceu.io.both": "同時", "gtceu.io.export": "輸出", "gtceu.io.import": "輸入", @@ -2503,7 +2497,7 @@ "gtceu.item_pipe.priority": "§9優先順序：§f%d", "gtceu.jade.amperage_use": "%s A", "gtceu.jade.at": " @ ", - "gtceu.jade.changes_eu_sec": "%sEU/s", + "gtceu.jade.changes_eu_tick": "%sEU/t", "gtceu.jade.cleaned_this_second": "污染清理速率：%s/s", "gtceu.jade.days": "%s天", "gtceu.jade.energy_stored": "%d / %d EU", @@ -2517,14 +2511,14 @@ "gtceu.jade.remaining_discharge_time": "預計耗空時間：%s", "gtceu.jade.seconds": "%s秒", "gtceu.jade.years": "%s年", - "gtceu.jei.bedrock_fluid.heavy_oil_deposit": "重油礦藏", - "gtceu.jei.bedrock_fluid.lava_deposit": "熔岩礦藏", - "gtceu.jei.bedrock_fluid.light_oil_deposit": "輕油礦藏", - "gtceu.jei.bedrock_fluid.natural_gas_deposit": "天然氣礦藏", - "gtceu.jei.bedrock_fluid.nether_natural_gas_deposit": "地獄天然氣礦藏", - "gtceu.jei.bedrock_fluid.oil_deposit": "石油礦藏", - "gtceu.jei.bedrock_fluid.raw_oil_deposit": "原油礦藏", - "gtceu.jei.bedrock_fluid.salt_water_deposit": "鹽水礦藏", + "bedrock_fluid.gtceu.heavy_oil_deposit": "重油礦藏", + "bedrock_fluid.gtceu.lava_deposit": "熔岩礦藏", + "bedrock_fluid.gtceu.light_oil_deposit": "輕油礦藏", + "bedrock_fluid.gtceu.natural_gas_deposit": "天然氣礦藏", + "bedrock_fluid.gtceu.nether_natural_gas_deposit": "地獄天然氣礦藏", + "bedrock_fluid.gtceu.oil_deposit": "石油礦藏", + "bedrock_fluid.gtceu.raw_oil_deposit": "原油礦藏", + "bedrock_fluid.gtceu.salt_water_deposit": "鹽水礦藏", "gtceu.jei.bedrock_fluid_diagram": "基岩流體生成資訊", "gtceu.jei.bedrock_ore_diagram": "基岩礦脈生成資訊", "gtceu.jei.fluid.dep_amount_hover": "消耗後消耗的量", @@ -2559,46 +2553,46 @@ "gtceu.jei.ore.surface_rock.0": "這種地表岩石標誌著礦脈的生成位置。", "gtceu.jei.ore.surface_rock.1": "挖掘掉落3小撮粉，受幸運加成", "gtceu.jei.ore_processing_diagram": "礦物處理流程圖", - "gtceu.jei.ore_vein.apatite_vein": "磷灰石礦脈", - "gtceu.jei.ore_vein.banded_iron_vein": "帶狀鐵礦脈", - "gtceu.jei.ore_vein.bauxite_vein_end": "終界鋁土礦脈", - "gtceu.jei.ore_vein.beryllium_vein": "鈹礦脈", - "gtceu.jei.ore_vein.cassiterite_vein": "錫石礦脈", - "gtceu.jei.ore_vein.certus_quartz": "賽特斯石英", - "gtceu.jei.ore_vein.coal_vein": "煤炭礦脈", - "gtceu.jei.ore_vein.copper_tin_vein": "銅錫礦脈", - "gtceu.jei.ore_vein.copper_vein": "銅礦脈", - "gtceu.jei.ore_vein.diamond_vein": "鑽石礦脈", - "gtceu.jei.ore_vein.galena_vein": "方鉛礦脈", - "gtceu.jei.ore_vein.garnet_tin_vein": "錫石榴石礦脈", - "gtceu.jei.ore_vein.garnet_vein": "石榴石礦脈", - "gtceu.jei.ore_vein.iron_vein": "鐵礦脈", - "gtceu.jei.ore_vein.lapis_vein": "青金石礦脈", - "gtceu.jei.ore_vein.lubricant_vein": "皂滑礦脈", - "gtceu.jei.ore_vein.magnetite_vein_end": "終界磁鐵礦脈", - "gtceu.jei.ore_vein.magnetite_vein_ow": "主世界磁鐵礦脈", - "gtceu.jei.ore_vein.manganese_vein": "錳礦脈", - "gtceu.jei.ore_vein.manganese_vein_ow": "主世界錳礦脈", - "gtceu.jei.ore_vein.mica_vein": "雲母礦脈", - "gtceu.jei.ore_vein.mineral_sand_vein": "礦砂礦脈", - "gtceu.jei.ore_vein.molybdenum_vein": "鉬礦脈", - "gtceu.jei.ore_vein.monazite_vein": "獨居石礦脈", - "gtceu.jei.ore_vein.naquadah_vein": "矽岩礦脈", - "gtceu.jei.ore_vein.nether_quartz_vein": "地獄石英礦脈", - "gtceu.jei.ore_vein.nickel_vein": "鎳礦脈", - "gtceu.jei.ore_vein.oilsands_vein": "油砂礦脈", - "gtceu.jei.ore_vein.olivine_vein": "橄欖石礦脈", - "gtceu.jei.ore_vein.pitchblende_vein_end": "終界瀝青鈾礦脈", - "gtceu.jei.ore_vein.redstone_vein": "紅石礦脈", - "gtceu.jei.ore_vein.redstone_vein_ow": "主世界紅石礦脈", - "gtceu.jei.ore_vein.saltpeter_vein": "硝石礦脈", - "gtceu.jei.ore_vein.salts_vein": "鹽礦脈", - "gtceu.jei.ore_vein.sapphire_vein": "藍寶石礦脈", - "gtceu.jei.ore_vein.scheelite_vein": "白鎢礦脈", - "gtceu.jei.ore_vein.sheldonite_vein": "謝爾頓礦脈", - "gtceu.jei.ore_vein.sulfur_vein": "硫礦脈", - "gtceu.jei.ore_vein.tetrahedrite_vein": "黝銅礦脈", - "gtceu.jei.ore_vein.topaz_vein": "黃玉礦脈", + "ore_vein.gtceu.apatite": "磷灰石", + "ore_vein.gtceu.banded_iron": "帶狀鐵", + "ore_vein.gtceu.end_bauxite": "終界鋁土", + "ore_vein.gtceu.beryllium": "鈹", + "ore_vein.gtceu.cassiterite": "錫石", + "ore_vein.gtceu.certus_quartz": "賽特斯石英", + "ore_vein.gtceu.coal": "煤炭", + "ore_vein.gtceu.copper_tin": "銅錫", + "ore_vein.gtceu.copper": "銅", + "ore_vein.gtceu.diamond": "鑽石", + "ore_vein.gtceu.galena": "方鉛", + "ore_vein.gtceu.garnet_tin": "錫石榴石", + "ore_vein.gtceu.garnet": "石榴石", + "ore_vein.gtceu.iron": "鐵", + "ore_vein.gtceu.lapis": "青金石", + "ore_vein.gtceu.lubricant": "皂滑", + "ore_vein.gtceu.end_magnetite": "終界磁鐵", + "ore_vein.gtceu.magnetite": "主世界磁鐵", + "ore_vein.gtceu.nether_manganese": "錳", + "ore_vein.gtceu.manganese": "主世界錳", + "ore_vein.gtceu.mica": "雲母", + "ore_vein.gtceu.mineral_sand": "礦砂", + "ore_vein.gtceu.molybdenum": "鉬", + "ore_vein.gtceu.monazite": "獨居石", + "ore_vein.gtceu.naquadah": "矽岩", + "ore_vein.gtceu.nether_quartz": "地獄石英", + "ore_vein.gtceu.nickel": "鎳", + "ore_vein.gtceu.oilsands": "油砂", + "ore_vein.gtceu.olivine": "橄欖石", + "ore_vein.gtceu.pitchblende": "終界瀝青鈾", + "ore_vein.gtceu.nether_redstone": "紅石", + "ore_vein.gtceu.redstone": "主世界紅石", + "ore_vein.gtceu.saltpeter": "硝石", + "ore_vein.gtceu.salts": "鹽", + "ore_vein.gtceu.sapphire": "藍寶石", + "ore_vein.gtceu.scheelite": "白鎢", + "ore_vein.gtceu.sheldonite": "謝爾頓", + "ore_vein.gtceu.sulfur": "硫", + "ore_vein.gtceu.tetrahedrite": "黝銅", + "ore_vein.gtceu.topaz": "黃玉", "gtceu.jei.ore_vein_diagram": "礦脈生成資訊", "gtceu.jei.ore_vein_diagram.chance": "§e機率：%s§r", "gtceu.jei.ore_vein_diagram.dimensions": "維度：", @@ -2606,9 +2600,6 @@ "gtceu.jei.ore_vein_diagram.weight": "權重：%s", "gtceu.jei.programmed_circuit": "程式設計電路頁", "gtceu.journeymap.options.layers": "勘探層", - "gtceu.journeymap.options.layers.bedrock_fluids": "顯示基岩流體礦脈", - "gtceu.journeymap.options.layers.hide_depleted": "隱藏枯竭的礦脈", - "gtceu.journeymap.options.layers.ore_veins": "顯示礦脈", "gtceu.key.armor_charging": "啟用/禁用盔甲向物品欄充能", "gtceu.key.armor_hover": "切換盔甲懸浮模式", "gtceu.key.armor_mode_switch": "切換盔甲模式", @@ -2616,11 +2607,11 @@ "gtceu.key.enable_jetpack": "啟用噴射背包", "gtceu.key.enable_step_assist": "啟用步行輔助", "gtceu.key.tool_aoe_change": "切換工具範圍模式", - "gtceu.large_boiler": "大型鍋爐", - "gtceu.large_chemical_reactor": "大型化學反應器", - "gtceu.laser_engraver": "雷射蝕刻機", - "gtceu.lathe": "車床", - "gtceu.macerator": "研磨機", + "recipe_type.gtceu.large_boiler": "大型鍋爐", + "recipe_type.gtceu.large_chemical_reactor": "大型化學反應器", + "recipe_type.gtceu.laser_engraver": "雷射蝕刻機", + "recipe_type.gtceu.lathe": "車床", + "recipe_type.gtceu.macerator": "研磨機", "gtceu.machine.active_transformer.tooltip.0": "變形金剛：偽裝的雷射", "gtceu.machine.active_transformer.tooltip.1": "可以將任意數量的能量§f輸入§7整合為任意數量的能量§f輸出§7。", "gtceu.machine.active_transformer.tooltip.2": "當你使用§d雷射§7進行能量傳輸時，擁有驚人的傳輸距離。", @@ -2633,8 +2624,8 @@ "gtceu.machine.available_recipe_map_4.tooltip": "可用配方型別：%s，%s，%s，%s", "gtceu.machine.basic.input_from_output_side.allow": "允許從輸出面輸入：", "gtceu.machine.basic.input_from_output_side.disallow": "禁止從輸出面輸入：", - "gtceu.machine.batch_disabled": "批處理已停用", - "gtceu.machine.batch_enabled": "批處理已啟用", + "gtceu.machine.batching.disabled": "批處理已停用", + "gtceu.machine.batching.enabled": "批處理已啟用", "gtceu.machine.bedrock_ore_miner.depletion": "§b損耗率：§f%s%%", "gtceu.machine.bedrock_ore_miner.description": "§7從基岩之下的礦脈鑽掘礦", "gtceu.machine.bedrock_ore_miner.production": "§e產量倍率：§f%dx，超頻後%fx", @@ -3265,7 +3256,7 @@ "medical_condition.gtceu.poison": "§2中毒", "medical_condition.gtceu.weak_poison": "§a輕度中毒", "gtceu.minimap.ore_vein.depleted": "已枯竭", - "gtceu.mixer": "攪拌機", + "recipe_type.gtceu.mixer": "攪拌機", "gtceu.mode.both": "§d全部（流體和物品）§r", "gtceu.mode.fluid": "§9流體§r", "gtceu.mode.item": "§6物品§r", @@ -3512,11 +3503,11 @@ "gtceu.oc.tooltip.2": "右鍵降低超頻等級", "gtceu.oc.tooltip.3": "中鍵重設超頻等級", "gtceu.oc.tooltip.4": "按住Shift以無損超頻顯示", - "gtceu.ore_washer": "洗礦廠", + "recipe_type.gtceu.ore_washer": "洗礦廠", "gtceu.ownership.name.argonauts": "Argonauts公會", "gtceu.ownership.name.ftb": "FTB團隊", "gtceu.ownership.name.player": "玩家", - "gtceu.packer": "打包機", + "recipe_type.gtceu.packer": "打包機", "gtceu.part_sharing.disabled": "多方塊結構共享：§4禁止", "gtceu.part_sharing.enabled": "多方塊結構共享：§a允許", "gtceu.placeholder_info.active.0": "若覆蓋板所貼附的方塊處於工作狀態，則返回1；否則返回0。", @@ -3713,19 +3704,19 @@ "gtceu.placeholder_info.voltage.0": "返回覆蓋板所貼附的的導線/線纜的電壓大小。", "gtceu.placeholder_info.voltage.1": "用法：", "gtceu.placeholder_info.voltage.2": " {voltage} -> 此導線/線纜的電壓", - "gtceu.plasma_generator": "電漿燃料", - "gtceu.polarizer": "兩極磁化機", - "gtceu.primitive_blast_furnace": "土高爐", - "gtceu.pyrolyse_oven": "熱解爐", + "recipe_type.gtceu.plasma_generator": "電漿燃料", + "recipe_type.gtceu.polarizer": "兩極磁化機", + "recipe_type.gtceu.primitive_blast_furnace": "土高爐", + "recipe_type.gtceu.pyrolyse_oven": "熱解爐", "gtceu.recipe.byproduct_tier": "%s§r+時有副產品", - "gtceu.recipe.category.arc_furnace_recycling": "電弧爐：電漿回收", - "gtceu.recipe.category.chem_dyes": "化學水浴機：化學染色", - "gtceu.recipe.category.extractor_recycling": "流體提取機：重熔回收", - "gtceu.recipe.category.ingot_molding": "合金爐：金屬成型", - "gtceu.recipe.category.macerator_recycling": "研磨機：粉碎回收", - "gtceu.recipe.category.ore_bathing": "化學水浴機：礦物處理", - "gtceu.recipe.category.ore_crushing": "研磨機：礦物處理", - "gtceu.recipe.category.ore_forging": "鍛造錘：礦物處理", + "recipe_category.gtceu.arc_furnace_recycling": "電弧爐：電漿回收", + "recipe_category.gtceu.chem_dyes": "化學水浴機：化學染色", + "recipe_category.gtceu.extractor_recycling": "流體提取機：重熔回收", + "recipe_category.gtceu.ingot_molding": "合金爐：金屬成型", + "recipe_category.gtceu.macerator_recycling": "研磨機：粉碎回收", + "recipe_category.gtceu.ore_bathing": "化學水浴機：礦物處理", + "recipe_category.gtceu.ore_crushing": "研磨機：礦物處理", + "recipe_category.gtceu.ore_forging": "鍛造錘：礦物處理", "gtceu.recipe.chance": "產出機率：%s + %s/電壓等級", "gtceu.recipe.cleanroom": "需要%s", "gtceu.recipe.cleanroom.display_name": "無塵室", @@ -3766,15 +3757,15 @@ "gtceu.recipe_modifier.insufficient_voltage": "電壓等級不足", "gtceu.recipe_type.show_recipes": "檢視配方", "gtceu.rei.group.potion_fluids": "藥水流體", - "gtceu.research_station": "研究站", - "gtceu.rock_breaker": "碎岩機", - "gtceu.scanner": "掃描器", + "recipe_type.gtceu.research_station": "研究站", + "recipe_type.gtceu.rock_breaker": "碎岩機", + "recipe_type.gtceu.scanner": "掃描器", "gtceu.scanner.copy_stick_empty": "§o空快閃記憶體", "gtceu.scanner.copy_stick_from": "§o要複製的快閃記憶體", "gtceu.scanner.copy_stick_to": "§o快閃記憶體（已複製）", - "gtceu.sifter": "篩選機", - "gtceu.steam_boiler": "蒸汽鍋爐", - "gtceu.steam_turbine": "蒸汽渦輪", + "recipe_type.gtceu.sifter": "篩選機", + "recipe_type.gtceu.steam_boiler": "蒸汽鍋爐", + "recipe_type.gtceu.steam_turbine": "蒸汽渦輪", "gtceu.subtitle.arc": "電弧爐：嗡——", "gtceu.subtitle.assembler": "組裝機：運行中", "gtceu.subtitle.bath": "化學水浴機：嘶嘶", @@ -3814,7 +3805,7 @@ "gtceu.subtitle.turbine": "渦輪：呼嘯", "gtceu.subtitle.wirecutter": "剪線鉗：剪斷", "gtceu.subtitle.wrench": "扳手：嘎啦", - "gtceu.thermal_centrifuge": "熱力離心機", + "recipe_type.gtceu.thermal_centrifuge": "熱力離心機", "gtceu.tool.class.axe": "斧", "gtceu.tool.class.butchery_knife": "屠刀", "gtceu.tool.class.crowbar": "撬棍", @@ -3967,8 +3958,8 @@ "gtceu.universal.tooltip.working_area_chunks": "§b工作範圍：§f%dx%d 區塊", "gtceu.universal.tooltip.working_area_chunks_max": "§b最大工作範圍：§f%dx%d 區塊", "gtceu.universal.tooltip.working_area_max": "§b最大工作範圍：§f%dx%d", - "gtceu.vacuum_freezer": "真空冷凍機", - "gtceu.wiremill": "線材軋機", + "recipe_type.gtceu.vacuum_freezer": "真空冷凍機", + "recipe_type.gtceu.wiremill": "線材軋機", "gui.gtceu.refund_all.desc": "將原料送回ME網路", "gui.gtceu.rename.desc": "重新命名樣板供應倉", "gui.gtceu.share_inventory.desc.0": "與樣板供應倉的所有樣板共享物品！", @@ -3977,7 +3968,6 @@ "gui.gtceu.share_tank.desc.0": "與樣板供應倉的所有樣板共享流體！", "gui.gtceu.share_tank.title": "共享流體庫存", "gui.widget.incrementButton.default_tooltip": "按住Shift，Ctrl鍵或同時按住這兩個鍵來改變數量", - "gui.widget.recipeProgressWidget.default_tooltip": "檢視配方", "item.glass_lens": "玻璃透鏡（白色）", "item.gtceu.activity_detector_cover": "活躍探測覆蓋板", "item.gtceu.activity_detector_cover.tooltip": "§7作§f覆蓋板§7時依照§f機器活躍狀態§7發出紅石訊號。", @@ -4225,11 +4215,11 @@ "item.gtceu.fullers_earth_dust": "漂白土", "item.gtceu.garnet_sand_dust": "石榴石砂", "item.gtceu.gear_casting_mold": "鑄造模具（齒輪）", - "item.gtceu.gear_casting_mold.small.tooltip": "§7用來製作小型齒輪的鑄造模具", + "item.gtceu.small_gear_casting_mold.tooltip": "§7用來製作小型齒輪的鑄造模具", "item.gtceu.gear_casting_mold.tooltip": "§7用來製作齒輪的鑄造模具", "item.gtceu.gear_extruder_mold": "擠壓模具（齒輪）", "item.gtceu.gear_extruder_mold.tooltip": "§7用來製作齒輪的擠壓模具", - "item.gtceu.gear_small_extruder_mold.tooltip": "§7用來製作小型齒輪的擠壓模具", + "item.gtceu.small_gear_extruder_mold.tooltip": "§7用來製作小型齒輪的擠壓模具", "item.gtceu.gelled_toluene": "膠凝甲苯", "item.gtceu.gelled_toluene.tooltip": "§7炸藥原料", "item.gtceu.glass_gem": "玻璃晶體", @@ -4318,9 +4308,9 @@ "item.gtceu.item_filter": "物品過濾卡", "item.gtceu.item_filter.tooltip.0": "§7作§f覆蓋板§7時過濾§f物品§7的輸入/輸出。", "item.gtceu.item_filter.tooltip.1": "§7亦可用於§f傳送帶§7與§f機械臂§7。", - "item.gtceu.item_smart_filter": "智慧物品過濾卡", - "item.gtceu.item_smart_filter.tooltip.0": "§7作§f覆蓋板§7時以§f機器的配方§7過濾§f物品§7的輸入/輸出。", - "item.gtceu.item_smart_filter.tooltip.1": "§7亦可用於§f傳送帶§7與§f機械臂§7。", + "item.gtceu.smart_item_filter": "智慧物品過濾卡", + "item.gtceu.smart_item_filter.tooltip.0": "§7作§f覆蓋板§7時以§f機器的配方§7過濾§f物品§7的輸入/輸出。", + "item.gtceu.smart_item_filter.tooltip.1": "§7亦可用於§f傳送帶§7與§f機械臂§7。", "item.gtceu.item_tag_filter": "物品標籤過濾卡", "item.gtceu.item_tag_filter.tooltip.0": "§7作§f覆蓋板§7時以§f物品標籤§7過濾§f物品§7的輸入/輸出。", "item.gtceu.item_tag_filter.tooltip.1": "§7亦可用於§f傳送帶§7與§f機械臂§7。", @@ -4543,16 +4533,16 @@ "item.gtceu.pill_casting_mold": "鑄造模具（藥片）", "item.gtceu.pink_dye_spray_can": "噴漆罐（粉紅色）", "item.gtceu.pink_glass_lens": "玻璃透鏡（粉紅色）", - "item.gtceu.pipe.huge_casting_mold.tooltip": "§7用來製作巨型管道的模具", - "item.gtceu.pipe.huge_extruder_mold.tooltip": "§7用來製作佔據整個方塊的管道的擠壓模具", - "item.gtceu.pipe.large_casting_mold.tooltip": "§7用來製作大型管道的模具", - "item.gtceu.pipe.large_extruder_mold.tooltip": "§7用來製作大型管道的擠壓模具", - "item.gtceu.pipe.normal_casting_mold.tooltip": "§7用來製作管道的模具", - "item.gtceu.pipe.normal_extruder_mold.tooltip": "§7用來製作管道的擠壓模具", - "item.gtceu.pipe.small_casting_mold.tooltip": "§7用來製作小型管道的模具", - "item.gtceu.pipe.small_extruder_mold.tooltip": "§7用來製作小型管道的擠壓模具", - "item.gtceu.pipe.tiny_casting_mold.tooltip": "§7用來製作微型管道的模具", - "item.gtceu.pipe.tiny_extruder_mold.tooltip": "§7用來製作微型管道的擠壓模具", + "item.gtceu.huge_pipe_casting_mold.tooltip": "§7用來製作巨型管道的模具", + "item.gtceu.huge_pipe_extruder_mold.tooltip": "§7用來製作佔據整個方塊的管道的擠壓模具", + "item.gtceu.large_pipe_casting_mold.tooltip": "§7用來製作大型管道的模具", + "item.gtceu.large_pipe_extruder_mold.tooltip": "§7用來製作大型管道的擠壓模具", + "item.gtceu.normal_pipe_casting_mold.tooltip": "§7用來製作管道的模具", + "item.gtceu.normal_pipe_extruder_mold.tooltip": "§7用來製作管道的擠壓模具", + "item.gtceu.small_pipe_casting_mold.tooltip": "§7用來製作小型管道的模具", + "item.gtceu.small_pipe_extruder_mold.tooltip": "§7用來製作小型管道的擠壓模具", + "item.gtceu.tiny_pipe_casting_mold.tooltip": "§7用來製作微型管道的模具", + "item.gtceu.tiny_pipe_extruder_mold.tooltip": "§7用來製作微型管道的擠壓模具", "item.gtceu.pitchblende_dust": "瀝青鈾礦", "item.gtceu.plant_ball": "植物球", "item.gtceu.plastic_circuit_board": "塑膠電路基板", @@ -4645,7 +4635,7 @@ "item.gtceu.rock_salt_dust": "岩鹽", "item.gtceu.rod_extruder_mold": "擠壓模具（桿）", "item.gtceu.rod_extruder_mold.tooltip": "§7用來製作桿的擠壓模具", - "item.gtceu.rod_long_extruder_mold.tooltip": "§7用來製作長桿的擠壓模具", + "item.gtceu.long_rod_extruder_mold.tooltip": "§7用來製作長桿的擠壓模具", "item.gtceu.rotor_casting_mold": "鑄造模具（轉子）", "item.gtceu.rotor_casting_mold.tooltip": "§7用來製作轉子的鑄造模具", "item.gtceu.rotor_extruder_mold": "擠壓模具（轉子）", @@ -5258,7 +5248,7 @@ "material.gtceu.goethite": "針鐵", "material.gtceu.gold": "金", "material.gtceu.granite": "花崗岩", - "material.gtceu.granite_red": "紅花崗岩", + "material.gtceu.red_granite": "紅花崗岩", "material.gtceu.granitic_mineral_sand": "花崗岩礦砂", "material.gtceu.graphene": "石墨烯", "material.gtceu.graphite": "石墨", @@ -5428,9 +5418,9 @@ "material.gtceu.octane": "辛烷", "material.gtceu.oganesson": "鿫", "material.gtceu.oil": "石油", - "material.gtceu.oil_heavy": "重油", - "material.gtceu.oil_light": "輕油", - "material.gtceu.oil_medium": "原油", + "material.gtceu.heavy_oil": "重油", + "material.gtceu.light_oil": "輕油", + "material.gtceu.raw_oil": "原油", "material.gtceu.oilsands": "油砂", "material.gtceu.olivine": "橄欖石", "material.gtceu.opal": "貓眼石", @@ -5458,7 +5448,7 @@ "material.gtceu.platinum_group_sludge": "鉑系礦泥", "material.gtceu.platinum_raw": "粗鉑", "material.gtceu.platinum_sludge_residue": "鉑泥渣", - "material.gtceu.plutonium": "鈽", + "material.gtceu.plutonium_239": "鈽-239", "material.gtceu.plutonium_241": "鈽-241", "material.gtceu.pollucite": "銫榴石", "material.gtceu.polonium": "釙", @@ -5642,7 +5632,7 @@ "material.gtceu.tungstic_acid": "鎢酸", "material.gtceu.ultimet": "哈氏合金", "material.gtceu.uraninite": "晶質鈾", - "material.gtceu.uranium": "鈾", + "material.gtceu.uranium_238": "鈾-238", "material.gtceu.uranium_235": "鈾-235", "material.gtceu.uranium_hexafluoride": "六氟化鈾", "material.gtceu.uranium_rhodium_dinaquadide": "鈾銠矽岩合金", @@ -5761,11 +5751,11 @@ "metaitem.machine_configuration.mode": "§a設定模式：§r%s", "metaitem.plugin.proxy.tooltips.1": "（請將螢幕調整為代理模式）", "metaitem.plugin.tooltips.1": "可為螢幕安裝外掛以實現更多功能。", - "metaitem.prospector.mode.bedrock_ore": "§b基岩礦勘探模式§r", - "metaitem.prospector.mode.fluid": "§b流體勘探模式§r", - "metaitem.prospector.mode.ores": "§a礦探勘模式§r", - "metaitem.prospector.tooltip.modes": "可用模式：", - "metaitem.prospector.tooltip.radius": "掃描半徑：%s", + "behavior.prospector.mode.bedrock_ore": "§b基岩礦勘探模式§r", + "behavior.prospector.mode.fluid": "§b流體勘探模式§r", + "behavior.prospector.mode.ores": "§a礦探勘模式§r", + "behavior.prospector.tooltip.modes": "可用模式：", + "behavior.prospector.tooltip.radius": "掃描半徑：%s", "metaitem.record.sus.tooltip": "§7Leonz - Among Us Drip", "metaitem.terminal.tooltip": "工欲善其事，必先利其器。", "metaitem.terminal.tooltip.creative": "§b創造模式", @@ -5806,7 +5796,7 @@ "tagprefix.blackstone": "黑石%s礦", "tagprefix.block": "%s方塊", "tagprefix.bolt": "%s螺栓", - "tagprefix.buzz_saw_blade": "%s圓鋸鋸片", + "tagprefix.buzzsaw_blade": "%s圓鋸鋸片", "tagprefix.cable_gt_double": "2x%s線纜", "tagprefix.cable_gt_hex": "16x%s線纜", "tagprefix.cable_gt_octal": "8x%s線纜", @@ -5904,13 +5894,5 @@ "tagprefix.wire_gt_octal": "8x%s導線", "tagprefix.wire_gt_quadruple": "4x%s導線", "tagprefix.wire_gt_single": "1x%s導線", - "tagprefix.wrench_tip": "%s扳手頂", - "tile.gtceu.brittle_charcoal.name": "脆木炭塊", - "tile.gtceu.brittle_charcoal.tooltip.0": "產自木炭堆點火器。", - "tile.gtceu.brittle_charcoal.tooltip.1": "採掘以獲得木炭。", - "tile.gtceu.foam.name": "建築泡沫", - "tile.gtceu.petrified_foam.name": "石化建築泡沫", - "tile.gtceu.reinforced_foam.name": "強化建築泡沫", - "tile.gtceu.reinforced_stone.name": "防爆石", - "tile.gtceu.seal.name": "密封方塊" + "tagprefix.wrench_tip": "%s扳手頂" } \ No newline at end of file diff --git a/src/test/java/com/gregtechceu/gtceu/gametest/world/RealWorldItemUsage.java b/src/test/java/com/gregtechceu/gtceu/gametest/world/RealWorldItemUsage.java index be92360251d..1d536bca94e 100644 --- a/src/test/java/com/gregtechceu/gtceu/gametest/world/RealWorldItemUsage.java +++ b/src/test/java/com/gregtechceu/gtceu/gametest/world/RealWorldItemUsage.java @@ -1,11 +1,12 @@ package com.gregtechceu.gtceu.gametest.world; import com.gregtechceu.gtceu.GTCEu; +import com.gregtechceu.gtceu.api.item.tool.GTToolType; +import com.gregtechceu.gtceu.api.item.tool.ToolHelper; +import com.gregtechceu.gtceu.common.data.GTMaterials; import net.minecraft.commands.arguments.EntityAnchorArgument.Anchor; import net.minecraft.core.BlockPos; -import net.minecraft.core.registries.Registries; -import net.minecraft.resources.ResourceKey; import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; @@ -39,9 +40,7 @@ public static void lookAndBreak(GameTestPlayer player, ExtendedGameTestHelper he public static void testPickaxeInstantPickup(ExtendedGameTestHelper helper) { var player = helper.makeTickingMockServerPlayerInLevel(GameType.SURVIVAL); player.moveTo(helper.absoluteVec(new Vec3(2.5, 2.0, 2.5))); - player.setItemSlot(EquipmentSlot.MAINHAND, - new ItemStack(helper.getLevel().registryAccess().registry(Registries.ITEM).orElseThrow() - .getOrThrow(ResourceKey.create(Registries.ITEM, GTCEu.id("neutronium_pickaxe"))))); + player.setItemSlot(EquipmentSlot.MAINHAND, ToolHelper.get(GTToolType.PICKAXE, GTMaterials.Neutronium)); // Allow player to stand helper.setBlock(new BlockPos(2, 1, 2), Blocks.BEDROCK); // Blocks to break