diff --git a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 index a47ecfb4..ad242f30 100644 --- a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 +++ b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 @@ -1,2 +1,2 @@ -// 1.21.1 2024-09-28T15:16:36.182199996 Languages: en_us -d3e2be554a94182ee48478c5fb400d6c6855736c assets/nautec/lang/en_us.json +// 1.21.1 2024-09-28T18:10:57.433125 Languages: en_us +5ee2e2b30f3a8f7d47da06cde200ab2378b8f45f assets/nautec/lang/en_us.json diff --git a/src/generated/resources/assets/nautec/lang/en_us.json b/src/generated/resources/assets/nautec/lang/en_us.json index dc47f363..2da9a44a 100644 --- a/src/generated/resources/assets/nautec/lang/en_us.json +++ b/src/generated/resources/assets/nautec/lang/en_us.json @@ -1,9 +1,88 @@ { + "augment_slot.nautec.body": "Body", + "augment_slot.nautec.eyes": "Eyes", + "augment_slot.nautec.head": "Head", + "augment_slot.nautec.heart": "Heart", + "augment_slot.nautec.left_arm": "Left Arm", + "augment_slot.nautec.left_leg": "Left Leg", + "augment_slot.nautec.lung": "Lungs", + "augment_slot.nautec.right_arm": "Right Arm", + "augment_slot.nautec.right_leg": "Right Leg", + "block.nautec.aquarine_steel_block": "Aquarine Steel Block", + "block.nautec.aquatic_catalyst": "Aquatic Catalyst", + "block.nautec.augmentation_station": "Augmentation Station", + "block.nautec.augmentation_station_extentsion": "Augmentation Station Extension", + "block.nautec.augmentation_station_part": "Augmentation Station", + "block.nautec.chiseled_dark_prismarine": "Chiseled Dark Prismarine", + "block.nautec.crate": "Crate", + "block.nautec.dark_prismarine_pillar": "Dark Prismarine Pillar", + "block.nautec.deep_sea_drain": "Deep Sea Drain", + "block.nautec.deep_sea_drain_wall": "Deep Sea Drain Wall", + "block.nautec.laser_junction": "Laser Junction", + "block.nautec.long_distance_laser": "Long Distance Laser", + "block.nautec.mixer": "Mixer", + "block.nautec.polished_prismarine": "Polished Prismarine", + "block.nautec.prismarine_crystal": "Prismarine Crystal", + "block.nautec.prismarine_laser_relay": "Prismarine Laser Relay", + "block.nautec.rusty_crate": "Rusty Crate", "book.nautec.nautec_guide.getting_started.introduction.description": "Intro desc", "book.nautec.nautec_guide.getting_started.introduction.intro.text": "TEEEEEEXT", "book.nautec.nautec_guide.getting_started.introduction.intro.title": "Intro Title", "book.nautec.nautec_guide.getting_started.introduction.name": "Introduction", "book.nautec.nautec_guide.getting_started.name": "Getting Started", "book.nautec.nautec_guide.name": "Nautec Guide", - "book.nautec.nautec_guide.tooltip": "Nautec Guide Tooltip" + "book.nautec.nautec_guide.tooltip": "Nautec Guide Tooltip", + "curios.identifier.battery": "Battery", + "curios.identifier.prism_monocle": "Monocle", + "fluid_type.nautec.electrolyte_algae_serum": "Electrolyte Algae Serum", + "fluid_type.nautec.etching_acid": "Etching Acid", + "fluid_type.nautec.soap_water": "Salt Water", + "item.nautec.air_bottle": "Pressurized Air Bottle", + "item.nautec.ancient_valve": "Ancient Valve", + "item.nautec.aquarine_steel_axe": "Aquarine Steel Axe", + "item.nautec.aquarine_steel_boots": "Aquarine Steel Boots", + "item.nautec.aquarine_steel_chestplate": "Aquarine Steel Chestplate", + "item.nautec.aquarine_steel_compound": "Aquarine Steel Compound", + "item.nautec.aquarine_steel_helmet": "Aquarine Steel Helmet", + "item.nautec.aquarine_steel_hoe": "Aquarine Steel Hoe", + "item.nautec.aquarine_steel_ingot": "Aquarine Steel Ingot", + "item.nautec.aquarine_steel_leggings": "Aquarine Steel Leggings", + "item.nautec.aquarine_steel_pickaxe": "Aquarine Steel Pickaxe", + "item.nautec.aquarine_steel_shovel": "Aquarine Steel Shovel", + "item.nautec.aquarine_steel_sword": "Aquarine Steel Sword", + "item.nautec.aquarine_steel_wrench": "Aquarine Steel Wrench", + "item.nautec.atlantic_gold_ingot": "Atlantic Gold Ingot", + "item.nautec.atlantic_gold_nugget": "Atlantic Gold Nugget", + "item.nautec.broken_whisk": "Broken Whisk", + "item.nautec.brown_polymer": "Brown Polymer", + "item.nautec.cast_iron_ingot": "Cast Iron Ingot", + "item.nautec.cast_iron_nugget": "Cast Iron Nugget", + "item.nautec.cast_iron_rod": "Cast Iron Rod", + "item.nautec.claw_robot_arm": "Claw Robot Arm", + "item.nautec.crowbar": "Crowbar", + "item.nautec.deepslate_rod": "Deepslate Rod", + "item.nautec.diving_boots": "Diving Boots", + "item.nautec.diving_chestplate": "Diving Chestplate", + "item.nautec.diving_helmet": "Diving Helmet", + "item.nautec.diving_leggings": "Diving Leggings", + "item.nautec.dolphin_fin": "Dolphin Fin", + "item.nautec.drowned_lungs": "Drowned Lungs", + "item.nautec.eas_bucket": "Electrolyte Algae Serum (EAS) Bucket", + "item.nautec.eas_vial": "Electrolyte Algae Serum (EAS) Vial", + "item.nautec.etching_acid_bucket": "Etching Acid Bucket", + "item.nautec.gear": "Gear", + "item.nautec.glass_vial": "Glass Vial", + "item.nautec.neptunes_trident": "Neptune's Trident", + "item.nautec.prism_monocle": "Prism Monocle", + "item.nautec.prismarine_crystal_shard": "Prismarine Crystal Shard", + "item.nautec.prismatic_battery": "Prismatic Battery", + "item.nautec.rusty_gear": "Rusty Gear", + "item.nautec.salt_water_bucket": "Salt Water Bucket", + "item.nautec.syringe_robot_arm": "Syringe Robot Arm", + "item.nautec.whisk": "Whisk", + "multiblock.info.actual_block": "Block: %s", + "multiblock.info.block_pos": "Coordinates: %d, %d, %d", + "multiblock.info.expected_block": "Expected: %s", + "multiblock.info.failed_to_construct": "Missing or invalid block", + "nautec.creative_tab.main": "NauTec" } \ No newline at end of file diff --git a/src/main/java/com/portingdeadmods/nautec/datagen/EnUsProvider.java b/src/main/java/com/portingdeadmods/nautec/datagen/EnUsProvider.java index 8ec710ec..3a080833 100644 --- a/src/main/java/com/portingdeadmods/nautec/datagen/EnUsProvider.java +++ b/src/main/java/com/portingdeadmods/nautec/datagen/EnUsProvider.java @@ -7,7 +7,6 @@ import com.portingdeadmods.nautec.registries.NTItems; import com.portingdeadmods.nautec.utils.Utils; import net.minecraft.data.PackOutput; -import net.minecraft.world.item.Item; import net.neoforged.neoforge.fluids.FluidType; import net.neoforged.neoforge.registries.NeoForgeRegistries; @@ -44,38 +43,57 @@ protected void addTranslations() { addItem(GEAR, "Gear"); addItem(ANCIENT_VALVE, "Ancient Valve"); - // Adding missing language keys - addItem("nautec.drowned_lungs", "Drowned Lungs"); - addItem("nautec.diving_helmet", "Diving Helmet"); - addItem("nautec.diving_chestplate", "Diving Chestplate"); - addItem("nautec.diving_leggings", "Diving Leggings"); - addItem("nautec.diving_boots", "Diving Boots"); - addItem("nautec.aquarine_steel_wrench", "Aquarine Steel Wrench"); - addItem("nautec.etching_acid_bucket", "Etching Acid Bucket"); - addItem("nautec.aquarine_steel_sword", "Aquarine Steel Sword"); - addItem("nautec.aquarine_steel_pickaxe", "Aquarine Steel Pickaxe"); - addItem("nautec.aquarine_steel_axe", "Aquarine Steel Axe"); - addItem("nautec.aquarine_steel_shovel", "Aquarine Steel Shovel"); - addItem("nautec.aquarine_steel_hoe", "Aquarine Steel Hoe"); - addItem("nautec.neptunes_trident", "Neptune's Trident"); - addItem("nautec.aquarine_steel_helmet", "Aquarine Steel Helmet"); - addItem("nautec.aquarine_steel_chestplate", "Aquarine Steel Chestplate"); - addItem("nautec.aquarine_steel_leggings", "Aquarine Steel Leggings"); - addItem("nautec.aquarine_steel_boots", "Aquarine Steel Boots"); - addItem("nautec.dolphin_fin", "Dolphin Fin"); - addItem("nautec.broken_whisk", "Broken Whisk"); - addItem("nautec.whisk", "Whisk"); - addItem("nautec.prismatic_battery", "Prismatic Battery"); - addItem("nautec.air_bottle", "Pressurized Air Bottle"); - addItem("nautec.aquarine_steel_compound", "Aquarine Steel Compound"); - addItem("nautec.prismarine_crystal_shard", "Prismarine Crystal Shard"); - addItem("nautec.claw_robot_arm", "Claw Robot Arm"); - addItem("nautec.syringe_robot_arm", "Syringe Robot Arm"); - addItem("nautec.deepslate_rod", "Deepslate Rod"); - addItem("nautec.brown_polymer", "Brown Polymer"); - addItem("nautec.cast_iron_ingot", "Cast Iron Ingot"); - addItem("nautec.cast_iron_rod", "Cast Iron Rod"); - addItem("nautec.cast_iron_nugget", "Cast Iron Nugget"); + // Adding missing items + addItem("drowned_lungs", "Drowned Lungs"); + addItem("diving_helmet", "Diving Helmet"); + addItem("diving_chestplate", "Diving Chestplate"); + addItem("diving_leggings", "Diving Leggings"); + addItem("diving_boots", "Diving Boots"); + addItem("aquarine_steel_wrench", "Aquarine Steel Wrench"); + addItem("etching_acid_bucket", "Etching Acid Bucket"); + addItem("aquarine_steel_sword", "Aquarine Steel Sword"); + addItem("aquarine_steel_pickaxe", "Aquarine Steel Pickaxe"); + addItem("aquarine_steel_axe", "Aquarine Steel Axe"); + addItem("aquarine_steel_shovel", "Aquarine Steel Shovel"); + addItem("aquarine_steel_hoe", "Aquarine Steel Hoe"); + addItem("neptunes_trident", "Neptune's Trident"); + addItem("aquarine_steel_helmet", "Aquarine Steel Helmet"); + addItem("aquarine_steel_chestplate", "Aquarine Steel Chestplate"); + addItem("aquarine_steel_leggings", "Aquarine Steel Leggings"); + addItem("aquarine_steel_boots", "Aquarine Steel Boots"); + addItem("dolphin_fin", "Dolphin Fin"); + addItem("broken_whisk", "Broken Whisk"); + addItem("whisk", "Whisk"); + addItem("prismatic_battery", "Prismatic Battery"); + addItem("air_bottle", "Pressurized Air Bottle"); + addItem("aquarine_steel_compound", "Aquarine Steel Compound"); + addItem("prismarine_crystal_shard", "Prismarine Crystal Shard"); + addItem("claw_robot_arm", "Claw Robot Arm"); + addItem("syringe_robot_arm", "Syringe Robot Arm"); + addItem("deepslate_rod", "Deepslate Rod"); + addItem("brown_polymer", "Brown Polymer"); + addItem("cast_iron_ingot", "Cast Iron Ingot"); + addItem("cast_iron_rod", "Cast Iron Rod"); + addItem("cast_iron_nugget", "Cast Iron Nugget"); + + // Adding missing block translations + addBlock("rusty_crate", "Rusty Crate"); + addBlock("polished_prismarine", "Polished Prismarine"); + addBlock("mixer", "Mixer"); + addBlock("long_distance_laser", "Long Distance Laser"); + addBlock("laser_junction", "Laser Junction"); + addBlock("prismarine_crystal", "Prismarine Crystal"); + addBlock("deep_sea_drain_wall", "Deep Sea Drain Wall"); + addBlock("augmentation_station", "Augmentation Station"); + addBlock("aquarine_steel_block", "Aquarine Steel Block"); + addBlock("aquatic_catalyst", "Aquatic Catalyst"); + addBlock("dark_prismarine_pillar", "Dark Prismarine Pillar"); + addBlock("chiseled_dark_prismarine", "Chiseled Dark Prismarine"); + addBlock("crate", "Crate"); + addBlock("prismarine_laser_relay", "Prismarine Laser Relay"); + addBlock("deep_sea_drain", "Deep Sea Drain"); + addBlock("augmentation_station_part", "Augmentation Station"); + addBlock("augmentation_station_extentsion", "Augmentation Station Extension"); // Multiblock information add("multiblock.info.failed_to_construct", "Missing or invalid block"); @@ -106,4 +124,8 @@ private void curiosIdent(String key, String val) { private void addItem(String key, String val) { add("item.nautec." + key, val); } + + private void addBlock(String key, String val) { + add("block.nautec." + key, val); + } } diff --git a/src/main/resources/assets/nautec/lang/en_us.json b/src/main/resources/assets/nautec/lang/en_us.json deleted file mode 100644 index 582918a2..00000000 --- a/src/main/resources/assets/nautec/lang/en_us.json +++ /dev/null @@ -1,91 +0,0 @@ -{ - "curios.identifier.prism_monocle": "Monocle", - "curios.identifier.battery": "Battery", - "nautec.creative_tab.main": "NauTec", - - "fluid_type.nautec.soap_water": "Salt Water", - "fluid_type.nautec.electrolyte_algae_serum": "Electrolyte Algae Serum", - "fluid_type.nautec.etching_acid": "Etching Acid", - - "item.nautec.prism_monocle": "Prism Monocle", - "item.nautec.aquarine_steel_ingot": "Aquarine Steel Ingot", - "item.nautec.atlantic_gold_ingot": "Atlantic Gold Ingot", - "item.nautec.salt_water_bucket": "Salt Water Bucket", - "item.nautec.eas_bucket": "Electrolyte Algae Serum (EAS) Bucket", - "item.nautec.glass_vial": "Glass Vial", - "item.nautec.eas_vial": "Vial of Electrolyte Algae Serum", - "item.nautec.crowbar": "Crowbar", - "item.nautec.atlantic_gold_nugget": "Atlantic Gold Nugget", - "item.nautec.rusty_gear": "Rusty Gear", - "item.nautec.gear": "Gear", - "item.nautec.ancient_valve": "Ancient Valve", - "item.nautec.valve": "Valve", - "item.nautec.drowned_lungs": "Drowned Lungs", - "item.nautec.diving_helmet": "Diving Helmet", - "item.nautec.diving_chestplate": "Diving Chestplate", - "item.nautec.diving_leggings": "Diving Leggings", - "item.nautec.diving_boots": "Diving Boots", - "item.nautec.aquarine_steel_wrench": "Aquarine Steel Wrench", - "item.nautec.etching_acid_bucket": "Etching Acid Bucket", - "item.nautec.aquarine_steel_sword": "Aquarine Steel Sword", - "item.nautec.aquarine_steel_pickaxe": "Aquarine Steel Pickaxe", - "item.nautec.aquarine_steel_axe": "Aquarine Steel Axe", - "item.nautec.aquarine_steel_shovel": "Aquarine Steel Shovel", - "item.nautec.aquarine_steel_hoe": "Aquarine Steel Hoe", - "item.nautec.neptunes_trident": "Netpune's Trident", - "item.nautec.aquarine_helmet": "Aquarine Steel Helmet", - "item.nautec.aquarine_chestplate": "Aquarine Steel Chestplate", - "item.nautec.aquarine_leggings": "Aquarine Steel Leggings", - "item.nautec.aquarine_boots": "Aquarine Steel Boots", - "item.nautec.dolphin_fin": "Dolphin Fin", - "item.nautec.aquarine_steel_helmet": "Aquarine Steel Helmet", - "item.nautec.aquarine_steel_chestplate": "Aquarine Steel Chestplate", - "item.nautec.aquarine_steel_leggings": "Aquarine Steel Leggings", - "item.nautec.aquarine_steel_boots": "Aquarine Steel Boots", - "item.nautec.broken_whisk": "Broken Whisk", - "item.nautec.whisk": "Whisk", - "item.nautec.prismatic_battery": "Prismatic Battery", - "item.nautec.air_bottle": "Pressurized Air Bottle", - "item.nautec.aquarine_steel_compound": "Aquarine Steel Compound", - "item.nautec.prismarine_crystal_shard": "Prismarine Crystal Shard", - "item.nautec.claw_robot_arm": "Claw Robot Arm", - "item.nautec.syringe_robot_arm": "Syringe Robot Arm", - "item.nautec.deepslate_rod": "Deepslate Rod", - "item.nautec.brown_polymer": "Brown Polymer", - "item.nautec.cast_iron_ingot": "Cast Iron Ingot", - "item.nautec.cast_iron_rod": "Cast Iron Rod", - "item.nautec.cast_iron_nugget": "Cast Iron Nugget", - - "block.nautec.rusty_crate": "Rusty Crate", - "block.nautec.polished_prismarine": "Polished Prismarine", - "block.nautec.mixer": "Mixer", - "block.nautec.long_distance_laser": "Long Distance Laser", - "block.nautec.laser_junction": "Laser Junction", - "block.nautec.prismarine_crystal": "Prismarine Crystal", - "block.nautec.deep_sea_drain_wall": "Deep Sea Drain Wall", - "block.nautec.augmentation_station": "Augmentation Station", - "block.nautec.aquarine_steel_block": "Aquarine Steel Block", - "block.nautec.aquatic_catalyst": "Aquatic Catalyst", - "block.nautec.dark_prismarine_pillar": "Dark Prismarine Pillar", - "block.nautec.chiseled_dark_prismarine": "Chiseled Dark Prismarine", - "block.nautec.crate": "Crate", - "block.nautec.prismarine_laser_relay": "Prismarine Laser Relay", - "block.nautec.deep_sea_drain": "Deep Sea Drain", - "block.nautec.augmentation_station_part": "Augmentation Station", - "block.nautec.augmentation_station_extentsion": "Augmentation Station Extension", - - "multiblock.info.failed_to_construct": "Missing or invalid block", - "multiblock.info.actual_block": "Block: %s", - "multiblock.info.expected_block": "Expected: %s", - "multiblock.info.block_pos": "Coordinates: %d, %d, %d", - - "augment_slot.nautec.head": "Head", - "augment_slot.nautec.eyes": "Eyes", - "augment_slot.nautec.body": "Body", - "augment_slot.nautec.lung": "Lungs", - "augment_slot.nautec.left_leg": "Left Leg", - "augment_slot.nautec.right_leg": "Right Leg", - "augment_slot.nautec.left_arm": "Left Arm", - "augment_slot.nautec.right_arm": "Right Arm", - "augment_slot.nautec.heart": "Heart" -} \ No newline at end of file