diff --git a/src/generated/resources/.cache/76628b3669be6416cac089213fb784b3a46a1968 b/src/generated/resources/.cache/76628b3669be6416cac089213fb784b3a46a1968 index 2566e667..fdc59cc3 100644 --- a/src/generated/resources/.cache/76628b3669be6416cac089213fb784b3a46a1968 +++ b/src/generated/resources/.cache/76628b3669be6416cac089213fb784b3a46a1968 @@ -1,2 +1,3 @@ -// 1.21.1 2024-09-29T17:05:32.0465436 Multiblocks: nautec +// 1.21.1 2024-09-29T21:55:50.099683555 Multiblocks: nautec +5b380130e6a0fb53e4ab4a015b4f93bf5d9d227d data/nautec/modonomicon/multiblocks/aumgentation_station.json 3acb60a2cc6ef165426fad03cba733ef181724b4 data/nautec/modonomicon/multiblocks/drain.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 534ff7c6..b8acb4b9 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.21.1 2024-09-29T15:46:30.476403575 Recipes +// 1.21.1 2024-09-29T21:55:50.104319123 Recipes 11639f08778ec1107c05d822f9beaa1f90e3bb32 data/minecraft/advancement/recipes/misc/cast_iron_ingot_blasting.json 5f305b97f7366fc61918bd266d0bacfa386b16c1 data/minecraft/advancement/recipes/misc/cast_iron_nugget_to_ingot.json c01db9d69b288d37c769cf605b945ebf60a08e21 data/minecraft/advancement/recipes/misc/diving_chestplate.json @@ -39,7 +39,7 @@ b8ada0e92e270525f1fbabdd97372d76c1a93add data/nautec/advancement/recipes/misc/de 6509407527141fb273373552cb19b6a67bea0f03 data/nautec/advancement/recipes/misc/diving_boots.json f453783b629e6901fe593efb42e4a537f9a615fd data/nautec/advancement/recipes/misc/diving_helmet.json 45f2ce9aa457103af0b898a510b7e5a279870619 data/nautec/advancement/recipes/misc/diving_leggings.json -5842ced583fa4591f1c28c0e93c1771ab1b7a7f4 data/nautec/advancement/recipes/misc/etching_acid_bucket.json +103976aab16087f503404cfee730b36686b1e36d data/nautec/advancement/recipes/misc/etching_acid_bucket.json 2e227620c2d867bc1e46276896b5281bb34d7eb0 data/nautec/advancement/recipes/misc/glass_vial.json e8c7d011fc8d7584ae12c127a368e794c349cc43 data/nautec/advancement/recipes/misc/laser_junction.json 5a63e821107905c4834ef94b9dda1d99041e5cc0 data/nautec/advancement/recipes/misc/long_distance_laser.json @@ -79,7 +79,7 @@ cfc02afe736a2867e27a155b5dc8d9f9c9f0f491 data/nautec/recipe/deep_sea_drain.json 374e9e369089bee2db4da1d961a2a11a93f7e88f data/nautec/recipe/diving_boots.json ad76d1e18615e634a5fd16459f0d0efaeea97cd2 data/nautec/recipe/diving_helmet.json 7ebba94ed073b518f596623e5c9f3e44d80c3ffa data/nautec/recipe/diving_leggings.json -d2755f100cbac4b39a6cc7968a24843d145ddecf data/nautec/recipe/etching_acid_bucket.json +5f41da0ad07bac6260eecf118c31796dff8a019d data/nautec/recipe/etching_acid_bucket.json fe30c6078bd52f68fa02455d52d2eb51b8718c16 data/nautec/recipe/glass_vial.json 0e781b8c85808d8ee2691a5c39404da2b6a8f061 data/nautec/recipe/item_etching/ancient_valve_to_valve.json 92b1c892b837a6f4a88591b221bc580fa73ee881 data/nautec/recipe/item_etching/rusty_crate_to_crate.json @@ -90,6 +90,7 @@ a4bdb97abe0834d405f7584452f78242585e02ff data/nautec/recipe/item_transformation/ 11d23344db3f6e98c1520328fd6c883bccd8ca57 data/nautec/recipe/long_distance_laser.json 4925f952a200ae56a4e1ad04a45897be4988aad4 data/nautec/recipe/mixer.json 35a2d38352317596d0e56958db954ee65944fd30 data/nautec/recipe/mixing/dried_kelp_slime_ball_prismarine_crystals_seagrass.json +90185890f5c29dcb38df30c183a46ffdeda8c9e6 data/nautec/recipe/mixing/redstone_gunpowder_bone_meal.json 674df651148d747a200794f496996b82ca94e72f data/nautec/recipe/nautec_guide.json cd9bfbdf0f0468399cc4700d0c360b8283253c96 data/nautec/recipe/polished_prismarine.json 4fe8f6115c759c654e132afedec76d846f0a89d5 data/nautec/recipe/prism_monocle.json diff --git a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 index 111e1458..114b1525 100644 --- a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 +++ b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 @@ -1,2 +1,2 @@ -// 1.21.1 2024-09-29T17:14:08.1277793 Languages: en_us -17675d653662e5e131d77eb054261fd9ff33115b assets/nautec/lang/en_us.json +// 1.21.1 2024-09-29T21:55:50.109163447 Languages: en_us +5ce473ca5ad3304926718956675435f92baea109 assets/nautec/lang/en_us.json diff --git a/src/generated/resources/.cache/eb748cc26e43de416ad491bd48ccca24d169a651 b/src/generated/resources/.cache/eb748cc26e43de416ad491bd48ccca24d169a651 index 3443573d..1f933583 100644 --- a/src/generated/resources/.cache/eb748cc26e43de416ad491bd48ccca24d169a651 +++ b/src/generated/resources/.cache/eb748cc26e43de416ad491bd48ccca24d169a651 @@ -1,4 +1,4 @@ -// 1.21.1 2024-09-29T17:14:08.1252643 Books: nautec +// 1.21.1 2024-09-29T21:55:50.102259945 Books: nautec 6d944fd1b3f4f8d8baf18317dbdea1e50476ed05 data/nautec/modonomicon/books/nautec_guide/book.json ea5fe754ad19a1903e7a9d19f39e3b1488e59cfe data/nautec/modonomicon/books/nautec_guide/categories/getting_started.json 41b01f32b9f23cf1eb5a33085b98bd30f0a1f943 data/nautec/modonomicon/books/nautec_guide/categories/laser_augmentation.json @@ -8,20 +8,21 @@ e29501f9e540790de1b926ec2c269c0b8906c5b6 data/nautec/modonomicon/books/nautec_gu 3025c1f954bcbae17b5500c8814af26ccda6cf0a data/nautec/modonomicon/books/nautec_guide/entries/getting_started/introduction.json 331ded6d67b46405edf0f82e7a74e5160530c1ca data/nautec/modonomicon/books/nautec_guide/entries/getting_started/item_transformation.json e3f1343172316670fa2248134771f053cdd7ce5e data/nautec/modonomicon/books/nautec_guide/entries/getting_started/laser_power.json +3298e959d881c62d904be82e4d69a9fedc5fa757 data/nautec/modonomicon/books/nautec_guide/entries/getting_started/machine_part.json 45e26701a17f09bdc7b1cb6883e95df5488f6d54 data/nautec/modonomicon/books/nautec_guide/entries/getting_started/monocle.json 208abc52b3b1a594abae2333834da891aef78ac1 data/nautec/modonomicon/books/nautec_guide/entries/getting_started/structures.json f8a4b84b6a937e6fbc1566d38f1bb6aa2642174d data/nautec/modonomicon/books/nautec_guide/entries/getting_started/utilities.json 7048a5be1bf4a964e785317ea716a44dcdf14ac8 data/nautec/modonomicon/books/nautec_guide/entries/laser_augmentation/aquarine_steel_armor.json db21fcc9c4e1801a8bf9886da26700b52e4d60be data/nautec/modonomicon/books/nautec_guide/entries/laser_augmentation/augmentation.json -c29d0c9790eaf1ab263e474b0a31298eb1f7211b data/nautec/modonomicon/books/nautec_guide/entries/laser_augmentation/augmentation_station.json -ee33a5f1dbc15855e961c09f85e4c9ec31251c71 data/nautec/modonomicon/books/nautec_guide/entries/laser_augmentation/laser_augmentation_introduction.json -07780c7ee007a420a044d5e382f37291dfa3e4b4 data/nautec/modonomicon/books/nautec_guide/entries/laser_augmentation/long_distance_laser.json +501c5b32cef70628ae813df135c5a7b69a3d3728 data/nautec/modonomicon/books/nautec_guide/entries/laser_augmentation/augmentation_station.json +a46ba5de3d71172e50fe191f2d6ef51327d7f188 data/nautec/modonomicon/books/nautec_guide/entries/laser_augmentation/laser_augmentation_introduction.json +513198812cfe6695951eb9e1f60fd3fcf8d36ee6 data/nautec/modonomicon/books/nautec_guide/entries/laser_augmentation/long_distance_laser.json c03c7b650f9ea70b95dcb4465e44d1abaa28d838 data/nautec/modonomicon/books/nautec_guide/entries/laser_augmentation/mob_augments.json d70be2eaf9729ca163499da6d7a33730cf7e07f2 data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/charger.json 86bf0538af8e99ca0d8477c0c301c0a7938dea44 data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/chemistry_introduction.json -8f50749cbdb6b3759aa9c9a937ec20d30a33d8e6 data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/crystal_shards.json +36ffcf02fad4cee8ac0db723f1c03bc2df14049e data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/crystal_shards.json 34c421cb513a6d5ac4631180a2bbd14aa09d021a data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/drain.json -65716fa85df9020bd445a8da037a326dd41e4887 data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/laser_manipulation.json +a7779a4159c603668355d3064d5bf7b4560a3490 data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/laser_manipulation.json 36b15f5de5e5af848e148b4b01fae16583900bca data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/mixer.json 928679f259e0edf901721ea568ce3a90918098e2 data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/prismatic_battery.json d7962fa5a5a4e89ba57d4f4ec46d4f98787a6d33 data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/tools.json diff --git a/src/generated/resources/assets/nautec/lang/en_us.json b/src/generated/resources/assets/nautec/lang/en_us.json index f0a1ad50..13031dac 100644 --- a/src/generated/resources/assets/nautec/lang/en_us.json +++ b/src/generated/resources/assets/nautec/lang/en_us.json @@ -49,6 +49,10 @@ "book.nautec.nautec_guide.getting_started.laser_power.intro.text": "Lasers are a mysterious technology. Nobody really knows\nexactly how to create them. However using some prismarine\nboth dark and light, one is able to create an Aquatic Catalyst.\n\\\nWhile this block itself does not possesses the ability to channel\nenergy into a laser.\n", "book.nautec.nautec_guide.getting_started.laser_power.intro.title": "An Introduction to Laser Power", "book.nautec.nautec_guide.getting_started.laser_power.name": "Laser Power", + "book.nautec.nautec_guide.getting_started.machine_part.description": "All over the place", + "book.nautec.nautec_guide.getting_started.machine_part.machine_part.text": "On your journey trough the ocean\nyou will find lots of seemingly\ndirty or damaged items that are\nin fact required for most machinery\nand even tools.\n\\\n\\\nNote however, that most of these items\nneed to be cleaned or repaired before\nbeing used.\n", + "book.nautec.nautec_guide.getting_started.machine_part.machine_part.title": "Machine Parts", + "book.nautec.nautec_guide.getting_started.machine_part.name": "Ancient Machine Parts", "book.nautec.nautec_guide.getting_started.monocle.description": "The Sixth Eye of the Sea", "book.nautec.nautec_guide.getting_started.monocle.monocle.text": "The Prism Monocle is a useful tool that allows you to display informations about the block you are looking at.\n\\\n\\\nIt is particularly useful to know how pure is a laser beam.\n\\\n\\\nIf some informations are missing, we recommend using the Jade mod as it has a more extensive support for Nautec.\n", "book.nautec.nautec_guide.getting_started.monocle.monocle.title": "Prism Monocle", @@ -68,32 +72,33 @@ "book.nautec.nautec_guide.laser_augmentation.aquarine_steel_armor.aquarine_steel_armor.title": "Aquarine Steel Armor", "book.nautec.nautec_guide.laser_augmentation.aquarine_steel_armor.description": "Fancy power quantum super ultra mecha armor", "book.nautec.nautec_guide.laser_augmentation.aquarine_steel_armor.name": "Aquarine Steel Armor", - "book.nautec.nautec_guide.laser_augmentation.augmentation.augmentation.text": "Step onto augmentation station. Make sure item in slot. Select slot, click apply. View applied augments in gui using keybind\n", + "book.nautec.nautec_guide.laser_augmentation.augmentation.augmentation.text": "To start the augmentation process, make sure each\nAugmentation Station Extension has an augment item\nand a Robot Arm as well as being supplied with enough\nPower.\n\\\nNext, step onto the middle of the Augmentation Station\nwhere a screen should open, in which you can configure\nthe augment and start its application.\n", "book.nautec.nautec_guide.laser_augmentation.augmentation.augmentation.title": "Player Augmentation", "book.nautec.nautec_guide.laser_augmentation.augmentation.description": "Infinite Possibilities", "book.nautec.nautec_guide.laser_augmentation.augmentation.name": "Player Augmentation", "book.nautec.nautec_guide.laser_augmentation.augmentation.robot_arm.text": "Used in the augmentation station, which when paired with a Mob Augment allows the player to augment the player with the supplied augment.\nCheck the Mob Augments page for more info on what you can augment with.\n", "book.nautec.nautec_guide.laser_augmentation.augmentation.robot_arm.title": "Robot arm", - "book.nautec.nautec_guide.laser_augmentation.augmentation_station.augmentation_station.text": "Build the multi, put in robot arms, supply with power\n", + "book.nautec.nautec_guide.laser_augmentation.augmentation_station.augmentation_station.text": "The Augmentation Station is the multiblock required\nfor applying augments to the player.\n\nWhen looking at an augmentation recipe (in JEI) you\nmight realise that it takes in up to 4 ingredients.\nThese ingredients need to be supplied by putting them\ninto the 4 augmentation station extensions. Note that\nfor each ingredient you also need to add a robot arm.\n", "book.nautec.nautec_guide.laser_augmentation.augmentation_station.augmentation_station.title": "Augmentation Station", + "book.nautec.nautec_guide.laser_augmentation.augmentation_station.augmentation_station_multiblock.text": "Right-click the Augmentation Station block with\nan Aquarine Steel Wrench to form it.\n\\\nMake sure, the augmentation station extension with\na robot arm is supplied with at least 15 power.\n", "book.nautec.nautec_guide.laser_augmentation.augmentation_station.description": "Its getting serious", "book.nautec.nautec_guide.laser_augmentation.augmentation_station.name": "Augmentation Station", "book.nautec.nautec_guide.laser_augmentation.laser_augmentation_introduction.description": "Beginning of the end", - "book.nautec.nautec_guide.laser_augmentation.laser_augmentation_introduction.long_distance_laser.text": "shoot lasers up to 64 blocks, might be bad for fps\n", - "book.nautec.nautec_guide.laser_augmentation.laser_augmentation_introduction.long_distance_laser.title": "Long Distance Laser", + "book.nautec.nautec_guide.laser_augmentation.laser_augmentation_introduction.laser_augmentation_intro.text": "Now that you have made such huge progress in your studies,\nyou are able to explore the most dangerous parts of science.\nBody Augmentation. Since this is such an\nadvanced topic I have dedicated this entire chapter to it.\n\\\n\\\nRead it carefully and with patience.\n", + "book.nautec.nautec_guide.laser_augmentation.laser_augmentation_introduction.laser_augmentation_intro.title": "Introduction to Laser Augmentation", "book.nautec.nautec_guide.laser_augmentation.laser_augmentation_introduction.name": "Introduction to Laser Augmentation", "book.nautec.nautec_guide.laser_augmentation.long_distance_laser.description": "Who needs pipelines when you can have this", - "book.nautec.nautec_guide.laser_augmentation.long_distance_laser.long_distance_laser.text": "shoot lasers up to 64 blocks, might be bad for fps\n", + "book.nautec.nautec_guide.laser_augmentation.long_distance_laser.long_distance_laser.text": "The Long Distance Laser allows you to shoot\nlaser up to 64 blocks rather than the typical\n16 blocks. Use this block wisely, as it might\ncause more lag than regular laser devices.\n", "book.nautec.nautec_guide.laser_augmentation.long_distance_laser.long_distance_laser.title": "Long Distance Laser", - "book.nautec.nautec_guide.laser_augmentation.long_distance_laser.name": "long_distance_laser", + "book.nautec.nautec_guide.laser_augmentation.long_distance_laser.name": "Long Distance Laser", "book.nautec.nautec_guide.laser_augmentation.mob_augments.description": "Yep, you need to kill ALL of those", - "book.nautec.nautec_guide.laser_augmentation.mob_augments.dolphin_fin.text": "Permanently gain the dolphins grace effect while swimming, for much faster water exploration.\nThis can be obtained as a rare drop from Dolphins.\n", + "book.nautec.nautec_guide.laser_augmentation.mob_augments.dolphin_fin.text": "The Dolphin Fin affects you with the Dolphins Grace effect while swimming.\n\\\nThis allows you to explore the water more efficiently.\n\\\n\\\nThis item can be obtained as a rare drop from Dolphins.\n", "book.nautec.nautec_guide.laser_augmentation.mob_augments.dolphin_fin.title": "Dolphin Fin", - "book.nautec.nautec_guide.laser_augmentation.mob_augments.drowned_lung.text": "You no longer lose oxygen while in water, this allows you to keep swimming indefinitely.\nThis can be obtained as a rare drop from Drowned.\n", + "book.nautec.nautec_guide.laser_augmentation.mob_augments.drowned_lung.text": "The Drowned Lungs is one of the most powerful augments.\n\\\nThey allow you to breathe both underwater and on the surface\n\\\n\\\nThis item can be obtained as a rare drop from Drowned.\n", "book.nautec.nautec_guide.laser_augmentation.mob_augments.drowned_lung.title": "Drowned Lungs", - "book.nautec.nautec_guide.laser_augmentation.mob_augments.eldritch_heart.text": "While you are in water, you regen your health\nThis can be obtain (somehow)\n", + "book.nautec.nautec_guide.laser_augmentation.mob_augments.eldritch_heart.text": "The Eldritch Heart will increase your Regeneration under water.\n\\\nWhile this might not sound too overwhelming on its own, it is\nworth noting, that the eldritch heart is also required for the\nAugmentation Station.\n\\\n\\\nThis item can be obtained from Elder Guardians.\n", "book.nautec.nautec_guide.laser_augmentation.mob_augments.eldritch_heart.title": "Eldritch_heart", - "book.nautec.nautec_guide.laser_augmentation.mob_augments.guardian_eye.text": "Gain the ability to shoot a laser at the entity you are looking at, within a 15 block radius.\nThis can be obtained as a rare drop from Guardians.\n", + "book.nautec.nautec_guide.laser_augmentation.mob_augments.guardian_eye.text": "The Guardian Eye gives you the ability to shoot a laser at the entity you are looking at, within a 15 block radius.\nNote however, that in order to do this you need to hold down a keybind.\n\\\n\\\nThe item can be obtained as a rare drop from Guardians.\n", "book.nautec.nautec_guide.laser_augmentation.mob_augments.guardian_eye.title": "Guardian Eye", "book.nautec.nautec_guide.laser_augmentation.mob_augments.name": "Mob Augments", "book.nautec.nautec_guide.laser_augmentation.name": "Laser Augmentation", @@ -111,16 +116,18 @@ "book.nautec.nautec_guide.laser_chemistry.chemistry_introduction.salt_water.title": "Salt Water", "book.nautec.nautec_guide.laser_chemistry.crystal_shards.description": "Not an amethyst rextexture!", "book.nautec.nautec_guide.laser_chemistry.crystal_shards.name": "Prismarine Crystal Shards", - "book.nautec.nautec_guide.laser_chemistry.crystal_shards.prismarine_crystal_shards.text": "Prismarine Crystal Shards are a pristine\nmaterial required for some of the most\nadvanced machinery.\n\\\n\\\nIn order to obtain them you have to\nuse the Aquarine Steel Pickaxe with\nits ability enabled and mine a Prismarine crystal.\n\\\nMake sure that it has more than 100 power as that is\nthe amount it needs to preserve the drops.\n", + "book.nautec.nautec_guide.laser_chemistry.crystal_shards.prismarine_crystal_shards.text": "Prismarine Crystal Shards are a pristine\nmaterial required for some of the most\nadvanced machinery.\n", "book.nautec.nautec_guide.laser_chemistry.crystal_shards.prismarine_crystal_shards.title": "Prismarine Crystal Shard", + "book.nautec.nautec_guide.laser_chemistry.crystal_shards.shard_and_crystal.text": "In order to obtain them you have to\nuse the Aquarine Steel Pickaxe with\nits ability enabled and mine a Prismarine crystal.\n\\\nMake sure that it has more than 100 power as that is\nthe amount it needs to preserve the drops.\n", "book.nautec.nautec_guide.laser_chemistry.drain.description": "Sucks in everything", "book.nautec.nautec_guide.laser_chemistry.drain.drain.text": "The Deep Sea Drain is a mutliblock dedicated\nto draining huge amounts of salt water.\n\\\nIn order to do so, it must be constructed in an\nocean biome. After forming the multiblock, shift-right-click\non the center valve block to open it.\nAlso make sure to right-click one of the middle wall blocks\nwith a wrench to open a laser port and supply it with power.\n", "book.nautec.nautec_guide.laser_chemistry.drain.drain.title": "Deep Sea Drain", - "book.nautec.nautec_guide.laser_chemistry.drain.drain_multi.text": "To form the deep sea drain, the player\nneeds to right-click the center block with\nan Aquarine Steel Wrench.\n\\\nBe Careful: The drain will suck in any entity! Even items\n", + "book.nautec.nautec_guide.laser_chemistry.drain.drain_multi.text": "To form the deep sea drain, you\nneeds to right-click the center block with\nan Aquarine Steel Wrench.\n\\\nBe Careful: The drain will suck in any entity! Even items\n", "book.nautec.nautec_guide.laser_chemistry.drain.name": "Deep Sea Drain", "book.nautec.nautec_guide.laser_chemistry.laser_manipulation.description": "Playing with Lasers !", - "book.nautec.nautec_guide.laser_chemistry.laser_manipulation.laser_manipulation.text": "The Prismarine Laser Relay is a block that allows you to extend the range of your lasers.\nMake sure to point the arrow to the right direction!\n\\\nIt is crafted using 6 Polish Prismarine blocks.\n\\\n\\\nThe Laser Junction is a block that allows you to split a laser beam into multiple directions.\nWhile the recipe is quite expensive, it is a very useful block to have.\n", - "book.nautec.nautec_guide.laser_chemistry.laser_manipulation.laser_manipulation.title": "Laser Manipulation", + "book.nautec.nautec_guide.laser_chemistry.laser_manipulation.laser_junction0.text": "The Laser Junction is a block that allows you to split a laser beam into multiple directions\nor bundle multiple Beams into a single one.\n", + "book.nautec.nautec_guide.laser_chemistry.laser_manipulation.laser_junction1.text": "Right-click or Shift-right-click to toggle input output on the blocks side.\nWhile this block is quite expensive, it is also a useful and very powerful block to have.\n", + "book.nautec.nautec_guide.laser_chemistry.laser_manipulation.laser_relay.text": "The Prismarine Laser Relay is a block that allows you to extend the range of your lasers.\nMake sure to point the arrow in the right direction!\n\\\nIt is crafted using 6 Polish Prismarine blocks.\n", "book.nautec.nautec_guide.laser_chemistry.laser_manipulation.name": "Laser Manipulation", "book.nautec.nautec_guide.laser_chemistry.mixer.description": "Mixing my way through the ocean", "book.nautec.nautec_guide.laser_chemistry.mixer.mixer.text": "The Mixer is a powerful machine that can mix and combine items in a variety of ways.\n\\\nIt requires laser power to operate. To display informations about the ongoing process, you can use the Monocle.\n", diff --git a/src/generated/resources/data/nautec/advancement/recipes/misc/etching_acid_bucket.json b/src/generated/resources/data/nautec/advancement/recipes/misc/etching_acid_bucket.json index 24f5855b..0696f571 100644 --- a/src/generated/resources/data/nautec/advancement/recipes/misc/etching_acid_bucket.json +++ b/src/generated/resources/data/nautec/advancement/recipes/misc/etching_acid_bucket.json @@ -5,7 +5,7 @@ "conditions": { "items": [ { - "items": "nautec:brown_polymer" + "items": "minecraft:poisonous_potato" } ] }, diff --git a/src/generated/resources/data/nautec/modonomicon/books/nautec_guide/entries/getting_started/machine_part.json b/src/generated/resources/data/nautec/modonomicon/books/nautec_guide/entries/getting_started/machine_part.json new file mode 100644 index 00000000..b84c3e35 --- /dev/null +++ b/src/generated/resources/data/nautec/modonomicon/books/nautec_guide/entries/getting_started/machine_part.json @@ -0,0 +1,36 @@ +{ + "background_u_index": 0, + "background_v_index": 0, + "category": "getting_started", + "description": "book.nautec.nautec_guide.getting_started.machine_part.description", + "hide_while_locked": false, + "icon": { + "item": "nautec:ancient_valve" + }, + "name": "book.nautec.nautec_guide.getting_started.machine_part.name", + "pages": [ + { + "type": "modonomicon:text", + "anchor": "", + "condition": { + "type": "modonomicon:none" + }, + "show_title_separator": true, + "text": "book.nautec.nautec_guide.getting_started.machine_part.machine_part.text", + "title": "book.nautec.nautec_guide.getting_started.machine_part.machine_part.title", + "use_markdown_in_title": false + } + ], + "parents": [ + { + "draw_arrow": true, + "entry": "getting_started/structures", + "line_enabled": true, + "line_reversed": false + } + ], + "show_when_any_parent_unlocked": false, + "sort_number": 8, + "x": 4, + "y": -2 +} \ No newline at end of file diff --git a/src/generated/resources/data/nautec/modonomicon/books/nautec_guide/entries/laser_augmentation/augmentation_station.json b/src/generated/resources/data/nautec/modonomicon/books/nautec_guide/entries/laser_augmentation/augmentation_station.json index 975a47a5..658dddfc 100644 --- a/src/generated/resources/data/nautec/modonomicon/books/nautec_guide/entries/laser_augmentation/augmentation_station.json +++ b/src/generated/resources/data/nautec/modonomicon/books/nautec_guide/entries/laser_augmentation/augmentation_station.json @@ -19,6 +19,17 @@ "text": "book.nautec.nautec_guide.laser_augmentation.augmentation_station.augmentation_station.text", "title": "book.nautec.nautec_guide.laser_augmentation.augmentation_station.augmentation_station.title", "use_markdown_in_title": false + }, + { + "type": "modonomicon:multiblock", + "anchor": "", + "condition": { + "type": "modonomicon:none" + }, + "multiblock_id": "aumgentation_station", + "multiblock_name": "", + "show_visualize_button": true, + "text": "book.nautec.nautec_guide.laser_augmentation.augmentation_station.augmentation_station_multiblock.text" } ], "parents": [ diff --git a/src/generated/resources/data/nautec/modonomicon/books/nautec_guide/entries/laser_augmentation/laser_augmentation_introduction.json b/src/generated/resources/data/nautec/modonomicon/books/nautec_guide/entries/laser_augmentation/laser_augmentation_introduction.json index 599bd4f2..6af0d2d6 100644 --- a/src/generated/resources/data/nautec/modonomicon/books/nautec_guide/entries/laser_augmentation/laser_augmentation_introduction.json +++ b/src/generated/resources/data/nautec/modonomicon/books/nautec_guide/entries/laser_augmentation/laser_augmentation_introduction.json @@ -16,8 +16,8 @@ "type": "modonomicon:none" }, "show_title_separator": true, - "text": "book.nautec.nautec_guide.laser_augmentation.laser_augmentation_introduction.long_distance_laser.text", - "title": "book.nautec.nautec_guide.laser_augmentation.laser_augmentation_introduction.long_distance_laser.title", + "text": "book.nautec.nautec_guide.laser_augmentation.laser_augmentation_introduction.laser_augmentation_intro.text", + "title": "book.nautec.nautec_guide.laser_augmentation.laser_augmentation_introduction.laser_augmentation_intro.title", "use_markdown_in_title": false } ], diff --git a/src/generated/resources/data/nautec/modonomicon/books/nautec_guide/entries/laser_augmentation/long_distance_laser.json b/src/generated/resources/data/nautec/modonomicon/books/nautec_guide/entries/laser_augmentation/long_distance_laser.json index b486d7bb..3e26303d 100644 --- a/src/generated/resources/data/nautec/modonomicon/books/nautec_guide/entries/laser_augmentation/long_distance_laser.json +++ b/src/generated/resources/data/nautec/modonomicon/books/nautec_guide/entries/laser_augmentation/long_distance_laser.json @@ -19,6 +19,17 @@ "text": "book.nautec.nautec_guide.laser_augmentation.long_distance_laser.long_distance_laser.text", "title": "book.nautec.nautec_guide.laser_augmentation.long_distance_laser.long_distance_laser.title", "use_markdown_in_title": false + }, + { + "type": "modonomicon:crafting_recipe", + "anchor": "", + "condition": { + "type": "modonomicon:none" + }, + "recipe_id_1": "nautec:long_distance_laser", + "text": "", + "title1": "Long Distance Laser Recipe", + "title2": "" } ], "parents": [ diff --git a/src/generated/resources/data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/crystal_shards.json b/src/generated/resources/data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/crystal_shards.json index d5034204..8e84f805 100644 --- a/src/generated/resources/data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/crystal_shards.json +++ b/src/generated/resources/data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/crystal_shards.json @@ -9,6 +9,18 @@ }, "name": "book.nautec.nautec_guide.laser_chemistry.crystal_shards.name", "pages": [ + { + "type": "modonomicon:spotlight", + "anchor": "", + "condition": { + "type": "modonomicon:none" + }, + "item": { + "item": "nautec:prismarine_crystal_shard" + }, + "text": "book.nautec.nautec_guide.laser_chemistry.crystal_shards.prismarine_crystal_shards.text", + "title": "book.nautec.nautec_guide.laser_chemistry.crystal_shards.prismarine_crystal_shards.title" + }, { "type": "modonomicon:text", "anchor": "", @@ -16,8 +28,8 @@ "type": "modonomicon:none" }, "show_title_separator": true, - "text": "book.nautec.nautec_guide.laser_chemistry.crystal_shards.prismarine_crystal_shards.text", - "title": "book.nautec.nautec_guide.laser_chemistry.crystal_shards.prismarine_crystal_shards.title", + "text": "book.nautec.nautec_guide.laser_chemistry.crystal_shards.shard_and_crystal.text", + "title": "", "use_markdown_in_title": false }, { diff --git a/src/generated/resources/data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/laser_manipulation.json b/src/generated/resources/data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/laser_manipulation.json index b447e1fa..b0d8b9d0 100644 --- a/src/generated/resources/data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/laser_manipulation.json +++ b/src/generated/resources/data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/laser_manipulation.json @@ -10,15 +10,15 @@ "name": "book.nautec.nautec_guide.laser_chemistry.laser_manipulation.name", "pages": [ { - "type": "modonomicon:text", + "type": "modonomicon:crafting_recipe", "anchor": "", "condition": { "type": "modonomicon:none" }, - "show_title_separator": true, - "text": "book.nautec.nautec_guide.laser_chemistry.laser_manipulation.laser_manipulation.text", - "title": "book.nautec.nautec_guide.laser_chemistry.laser_manipulation.laser_manipulation.title", - "use_markdown_in_title": false + "recipe_id_1": "nautec:prismarine_laser_relay", + "text": "book.nautec.nautec_guide.laser_chemistry.laser_manipulation.laser_relay.text", + "title1": "Prismarine Laser Relay", + "title2": "" }, { "type": "modonomicon:crafting_recipe", @@ -26,11 +26,21 @@ "condition": { "type": "modonomicon:none" }, - "recipe_id_1": "nautec:prismarine_laser_relay", - "recipe_id_2": "nautec:laser_junction", - "text": "", - "title1": "Prismarine Laser Relay", - "title2": "Laser Junction" + "recipe_id_1": "nautec:laser_junction", + "text": "book.nautec.nautec_guide.laser_chemistry.laser_manipulation.laser_junction0.text", + "title1": "Laser Junction", + "title2": "" + }, + { + "type": "modonomicon:text", + "anchor": "", + "condition": { + "type": "modonomicon:none" + }, + "show_title_separator": true, + "text": "book.nautec.nautec_guide.laser_chemistry.laser_manipulation.laser_junction1.text", + "title": "", + "use_markdown_in_title": false } ], "show_when_any_parent_unlocked": false, diff --git a/src/generated/resources/data/nautec/modonomicon/multiblocks/aumgentation_station.json b/src/generated/resources/data/nautec/modonomicon/multiblocks/aumgentation_station.json new file mode 100644 index 00000000..6bcc5e81 --- /dev/null +++ b/src/generated/resources/data/nautec/modonomicon/multiblocks/aumgentation_station.json @@ -0,0 +1,30 @@ +{ + "type": "modonomicon:dense", + "mapping": { + "0": { + "type": "modonomicon:block", + "block": "nautec:augmentation_station" + }, + "E": { + "type": "modonomicon:block", + "block": "nautec:augmentation_station_extension" + }, + "P": { + "type": "modonomicon:block", + "block": "nautec:polished_prismarine" + }, + "S": { + "type": "modonomicon:block", + "block": "nautec:aquarine_steel_block" + } + }, + "pattern": [ + [ + "__E__", + "_SPS_", + "EP0PE", + "_SPS_", + "__E__" + ] + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/nautec/recipe/etching_acid_bucket.json b/src/generated/resources/data/nautec/recipe/etching_acid_bucket.json index 7749410f..7ada1590 100644 --- a/src/generated/resources/data/nautec/recipe/etching_acid_bucket.json +++ b/src/generated/resources/data/nautec/recipe/etching_acid_bucket.json @@ -1,39 +1,22 @@ { - "type": "minecraft:crafting_shaped", + "type": "minecraft:crafting_shapeless", "category": "misc", - "key": { - "A": { + "ingredients": [ + { "item": "minecraft:poisonous_potato" }, - "B": { - "item": "minecraft:water_bucket" - }, - "C": { - "item": "minecraft:copper_ingot" - }, - "D": { - "item": "minecraft:redstone" - }, - "E": { - "item": "minecraft:glowstone_dust" - }, - "F": { - "item": "minecraft:blaze_powder" - }, - "G": { + { "item": "minecraft:gunpowder" }, - "H": { - "item": "minecraft:blaze_powder" - }, - "I": { + { "item": "minecraft:bone_meal" + }, + { + "item": "minecraft:water_bucket" + }, + { + "item": "minecraft:redstone" } - }, - "pattern": [ - "ACE", - "HBD", - "IGF" ], "result": { "count": 1, diff --git a/src/generated/resources/data/nautec/recipe/mixing/redstone_gunpowder_bone_meal.json b/src/generated/resources/data/nautec/recipe/mixing/redstone_gunpowder_bone_meal.json new file mode 100644 index 00000000..16ac7518 --- /dev/null +++ b/src/generated/resources/data/nautec/recipe/mixing/redstone_gunpowder_bone_meal.json @@ -0,0 +1,24 @@ +{ + "type": "nautec:mixing", + "duration": 1200, + "fluid_ingredient": { + "amount": 1000, + "id": "nautec:salt_water" + }, + "fluid_result": { + "amount": 1000, + "id": "nautec:etching_acid" + }, + "ingredients": [ + { + "item": "minecraft:redstone" + }, + { + "item": "minecraft:gunpowder" + }, + { + "item": "minecraft:bone_meal" + } + ], + "result": {} +} \ No newline at end of file diff --git a/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/NautecGuideMultiblockProvider.java b/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/NautecGuideMultiblockProvider.java index 58a4da0f..d0229dc5 100644 --- a/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/NautecGuideMultiblockProvider.java +++ b/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/NautecGuideMultiblockProvider.java @@ -20,5 +20,17 @@ public void buildMultiblocks() { ) .block('W', NTBlocks.DRAIN_WALL) .block('0', NTBlocks.DRAIN).build(false)); + this.add(modLoc("aumgentation_station"), new MultiblockProvider.DenseMultiblockBuilder() + .layer( + " E ", + " SPS ", + "EP0PE", + " SPS ", + " E " + ) + .block('S', NTBlocks.AQUARINE_STEEL_BLOCK) + .block('P', NTBlocks.POLISHED_PRISMARINE) + .block('E', NTBlocks.AUGMENTATION_STATION_EXTENSION) + .block('0', NTBlocks.AUGMENTATION_STATION).build(false)); } } diff --git a/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/GettingStartedCategory.java b/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/GettingStartedCategory.java index d50fef58..725c0f9b 100644 --- a/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/GettingStartedCategory.java +++ b/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/GettingStartedCategory.java @@ -43,6 +43,9 @@ protected void generateEntries() { BookEntryModel cratesEtching = new CratesEtchingEntry(this) .generate(new Vec2(2, 2)); add(cratesEtching.withParent(structuresEntry)); + BookEntryModel machinePartEntry = new MachinePartEntry(this) + .generate(new Vec2(4, -2)); + add(machinePartEntry.withParent(structuresEntry)); } @Override diff --git a/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/getting_started/MachinePartEntry.java b/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/getting_started/MachinePartEntry.java new file mode 100644 index 00000000..0ec99356 --- /dev/null +++ b/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/getting_started/MachinePartEntry.java @@ -0,0 +1,65 @@ +package com.portingdeadmods.nautec.compat.modonomicon.datagen.book.nautec_guide.getting_started; + +import com.klikli_dev.modonomicon.api.datagen.CategoryProviderBase; +import com.klikli_dev.modonomicon.api.datagen.EntryBackground; +import com.klikli_dev.modonomicon.api.datagen.EntryProvider; +import com.klikli_dev.modonomicon.api.datagen.book.BookIconModel; +import com.klikli_dev.modonomicon.api.datagen.book.page.BookSpotlightPageModel; +import com.klikli_dev.modonomicon.api.datagen.book.page.BookTextPageModel; +import com.mojang.datafixers.util.Pair; +import com.portingdeadmods.nautec.registries.NTItems; + +public class MachinePartEntry extends EntryProvider { + public MachinePartEntry(CategoryProviderBase parent) { + super(parent); + } + + @Override + protected void generatePages() { + this.page("machine_part", () -> BookTextPageModel.create() + .withTitle(this.context().pageTitle()) + .withText(this.context().pageText())); + this.pageTitle("Machine Parts"); + this.pageText(""" + On your journey trough the ocean + you will find lots of seemingly + dirty or damaged items that are + in fact required for most machinery + and even tools. + \\ + \\ + Note however, that most of these items + need to be cleaned or repaired before + being used. + """); + + this.page("machine_part_examples", () -> BookSpotlightPageModel.create() + .withTitle(this.context().pageTitle()) + .withItem(NTItems.BURNT_COIL)); + } + + @Override + protected String entryName() { + return "Ancient Machine Parts"; + } + + @Override + protected String entryDescription() { + return "All over the place"; + } + + @Override + protected Pair entryBackground() { + return EntryBackground.DEFAULT; + } + + @Override + protected BookIconModel entryIcon() { + return BookIconModel.create(NTItems.ANCIENT_VALVE); + } + + @Override + protected String entryId() { + return "machine_part"; + } +} diff --git a/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/laser_augmentation/AugmentationEntry.java b/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/laser_augmentation/AugmentationEntry.java index eaaf948f..33fa850e 100644 --- a/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/laser_augmentation/AugmentationEntry.java +++ b/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/laser_augmentation/AugmentationEntry.java @@ -21,7 +21,14 @@ protected void generatePages() { .withText(this.context().pageText())); this.pageTitle("Player Augmentation"); this.pageText(""" - Step onto augmentation station. Make sure item in slot. Select slot, click apply. View applied augments in gui using keybind + To start the augmentation process, make sure each + Augmentation Station Extension has an augment item + and a Robot Arm as well as being supplied with enough + Power. + \\ + Next, step onto the middle of the Augmentation Station + where a screen should open, in which you can configure + the augment and start its application. """); this.page("robot_arm", () -> BookSpotlightPageModel.create() .withTitle(this.context().pageTitle()) diff --git a/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/laser_augmentation/AugmentationStationEntry.java b/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/laser_augmentation/AugmentationStationEntry.java index 90b371fb..f473294c 100644 --- a/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/laser_augmentation/AugmentationStationEntry.java +++ b/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/laser_augmentation/AugmentationStationEntry.java @@ -4,6 +4,7 @@ import com.klikli_dev.modonomicon.api.datagen.EntryBackground; import com.klikli_dev.modonomicon.api.datagen.EntryProvider; import com.klikli_dev.modonomicon.api.datagen.book.BookIconModel; +import com.klikli_dev.modonomicon.api.datagen.book.page.BookMultiblockPageModel; import com.klikli_dev.modonomicon.api.datagen.book.page.BookTextPageModel; import com.mojang.datafixers.util.Pair; import com.portingdeadmods.nautec.registries.NTBlocks; @@ -21,7 +22,26 @@ protected void generatePages() { .withText(this.context().pageText())); this.pageTitle("Augmentation Station"); this.pageText(""" - Build the multi, put in robot arms, supply with power + The Augmentation Station is the multiblock required + for applying augments to the player. + + When looking at an augmentation recipe (in JEI) you + might realise that it takes in up to 4 ingredients. + These ingredients need to be supplied by putting them + into the 4 augmentation station extensions. Note that + for each ingredient you also need to add a robot arm. + """); + + this.page("augmentation_station_multiblock", () -> BookMultiblockPageModel.create() + .withMultiblockId(modLoc("aumgentation_station")) + .withVisualizeButton(true) + .withText(this.context().pageText())); + this.pageText(""" + Right-click the Augmentation Station block with + an Aquarine Steel Wrench to form it. + \\ + Make sure, the augmentation station extension with + a robot arm is supplied with at least 15 power. """); } diff --git a/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/laser_augmentation/LaserAugmentationIntroductionEntry.java b/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/laser_augmentation/LaserAugmentationIntroductionEntry.java index 762fb267..99384b63 100644 --- a/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/laser_augmentation/LaserAugmentationIntroductionEntry.java +++ b/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/laser_augmentation/LaserAugmentationIntroductionEntry.java @@ -15,12 +15,18 @@ public LaserAugmentationIntroductionEntry(CategoryProviderBase parent) { @Override protected void generatePages() { - this.page("long_distance_laser", () -> BookTextPageModel.create() + this.page("laser_augmentation_intro", () -> BookTextPageModel.create() .withTitle(this.context().pageTitle()) .withText(this.context().pageText())); - this.pageTitle("Long Distance Laser"); + this.pageTitle("Introduction to Laser Augmentation"); this.pageText(""" - shoot lasers up to 64 blocks, might be bad for fps + Now that you have made such huge progress in your studies, + you are able to explore the most dangerous parts of science. + Body Augmentation. Since this is such an + advanced topic I have dedicated this entire chapter to it. + \\ + \\ + Read it carefully and with patience. """); } diff --git a/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/laser_augmentation/LongDistanceLaserEntry.java b/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/laser_augmentation/LongDistanceLaserEntry.java index 9aac65e1..7a61b921 100644 --- a/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/laser_augmentation/LongDistanceLaserEntry.java +++ b/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/laser_augmentation/LongDistanceLaserEntry.java @@ -4,6 +4,7 @@ import com.klikli_dev.modonomicon.api.datagen.EntryBackground; import com.klikli_dev.modonomicon.api.datagen.EntryProvider; import com.klikli_dev.modonomicon.api.datagen.book.BookIconModel; +import com.klikli_dev.modonomicon.api.datagen.book.page.BookCraftingRecipePageModel; import com.klikli_dev.modonomicon.api.datagen.book.page.BookTextPageModel; import com.mojang.datafixers.util.Pair; import com.portingdeadmods.nautec.registries.NTBlocks; @@ -20,13 +21,20 @@ protected void generatePages() { .withText(this.context().pageText())); this.pageTitle("Long Distance Laser"); this.pageText(""" - shoot lasers up to 64 blocks, might be bad for fps + The Long Distance Laser allows you to shoot + laser up to 64 blocks rather than the typical + 16 blocks. Use this block wisely, as it might + cause more lag than regular laser devices. """); + + this.page("ldl_recipe", () -> BookCraftingRecipePageModel.create() + .withTitle1("Long Distance Laser Recipe") + .withRecipeId1("nautec:long_distance_laser")); } @Override protected String entryName() { - return "long_distance_laser"; + return "Long Distance Laser"; } @Override diff --git a/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/laser_augmentation/MobAugmentEntry.java b/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/laser_augmentation/MobAugmentEntry.java index 24844b41..974c5c07 100644 --- a/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/laser_augmentation/MobAugmentEntry.java +++ b/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/laser_augmentation/MobAugmentEntry.java @@ -22,8 +22,11 @@ protected void generatePages() { .withText(this.context().pageText())); this.pageTitle("Guardian Eye"); this.pageText(""" - Gain the ability to shoot a laser at the entity you are looking at, within a 15 block radius. - This can be obtained as a rare drop from Guardians. + The Guardian Eye gives you the ability to shoot a laser at the entity you are looking at, within a 15 block radius. + Note however, that in order to do this you need to hold down a keybind. + \\ + \\ + The item can be obtained as a rare drop from Guardians. """); this.page("dolphin_fin", () -> BookSpotlightPageModel.create() .withTitle(this.context().pageTitle()) @@ -31,8 +34,12 @@ protected void generatePages() { .withText(this.context().pageText())); this.pageTitle("Dolphin Fin"); this.pageText(""" - Permanently gain the dolphins grace effect while swimming, for much faster water exploration. - This can be obtained as a rare drop from Dolphins. + The Dolphin Fin affects you with the Dolphins Grace effect while swimming. + \\ + This allows you to explore the water more efficiently. + \\ + \\ + This item can be obtained as a rare drop from Dolphins. """); this.page("drowned_lung", () -> BookSpotlightPageModel.create() .withTitle(this.context().pageTitle()) @@ -40,8 +47,12 @@ protected void generatePages() { .withText(this.context().pageText())); this.pageTitle("Drowned Lungs"); this.pageText(""" - You no longer lose oxygen while in water, this allows you to keep swimming indefinitely. - This can be obtained as a rare drop from Drowned. + The Drowned Lungs is one of the most powerful augments. + \\ + They allow you to breathe both underwater and on the surface + \\ + \\ + This item can be obtained as a rare drop from Drowned. """); this.page("eldritch_heart", () -> BookSpotlightPageModel.create() .withTitle(this.context().pageTitle()) @@ -49,8 +60,14 @@ protected void generatePages() { .withText(this.context().pageText())); this.pageTitle("Eldritch_heart"); this.pageText(""" - While you are in water, you regen your health - This can be obtain (somehow) + The Eldritch Heart will increase your Regeneration under water. + \\ + While this might not sound too overwhelming on its own, it is + worth noting, that the eldritch heart is also required for the + Augmentation Station. + \\ + \\ + This item can be obtained from Elder Guardians. """); } diff --git a/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/laser_chemistry/CrystalShardsEntry.java b/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/laser_chemistry/CrystalShardsEntry.java index 46a77b7d..f03c6e16 100644 --- a/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/laser_chemistry/CrystalShardsEntry.java +++ b/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/laser_chemistry/CrystalShardsEntry.java @@ -17,16 +17,19 @@ public CrystalShardsEntry(CategoryProviderBase parent) { @Override protected void generatePages() { - this.page("prismarine_crystal_shards", () -> BookTextPageModel.create() + this.page("prismarine_crystal_shards", () -> BookSpotlightPageModel.create() .withTitle(this.context().pageTitle()) + .withItem(NTItems.PRISMARINE_CRYSTAL_SHARD) .withText(this.context().pageText())); this.pageTitle("Prismarine Crystal Shard"); this.pageText(""" Prismarine Crystal Shards are a pristine material required for some of the most advanced machinery. - \\ - \\ + """); + this.page("shard_and_crystal", () -> BookTextPageModel.create() + .withText(this.context().pageText())); + this.pageText(""" In order to obtain them you have to use the Aquarine Steel Pickaxe with its ability enabled and mine a Prismarine crystal. @@ -34,11 +37,6 @@ protected void generatePages() { Make sure that it has more than 100 power as that is the amount it needs to preserve the drops. """); - - this.page("shard_and_crystal", () -> BookSpotlightPageModel.create() - .withTitle("Crystal & Shard") - .withItem(NTBlocks.PRISMARINE_CRYSTAL) - .withItem(NTItems.PRISMARINE_CRYSTAL_SHARD)); } @Override diff --git a/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/laser_chemistry/DrainEntry.java b/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/laser_chemistry/DrainEntry.java index d5526815..5b15e635 100644 --- a/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/laser_chemistry/DrainEntry.java +++ b/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/laser_chemistry/DrainEntry.java @@ -37,7 +37,7 @@ protected void generatePages() { .withVisualizeButton(true) .withText(this.context().pageText())); this.pageText(""" - To form the deep sea drain, the player + To form the deep sea drain, you needs to right-click the center block with an Aquarine Steel Wrench. \\ diff --git a/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/laser_chemistry/LaserManipulationEntry.java b/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/laser_chemistry/LaserManipulationEntry.java index 635ca1f3..661592ec 100644 --- a/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/laser_chemistry/LaserManipulationEntry.java +++ b/src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/laser_chemistry/LaserManipulationEntry.java @@ -16,25 +16,30 @@ public LaserManipulationEntry(CategoryProviderBase parent) { @Override protected void generatePages() { - this.page("laser_manipulation", () -> BookTextPageModel.create() - .withTitle(this.context().pageTitle()) - .withText(this.context().pageText())); - this.pageTitle("Laser Manipulation"); - this.pageText(""" - The Prismarine Laser Relay is a block that allows you to extend the range of your lasers. - Make sure to point the arrow to the right direction! - \\ - It is crafted using 6 Polish Prismarine blocks. - \\ - \\ - The Laser Junction is a block that allows you to split a laser beam into multiple directions. - While the recipe is quite expensive, it is a very useful block to have. - """); - this.page("laser_manipulation_recipe", () -> BookCraftingRecipePageModel.create() - .withTitle1("Prismarine Laser Relay") - .withRecipeId1("nautec:prismarine_laser_relay") - .withTitle2("Laser Junction") - .withRecipeId2("nautec:laser_junction")); + this.page("laser_relay", () -> BookCraftingRecipePageModel.create() + .withTitle1("Prismarine Laser Relay") + .withRecipeId1("nautec:prismarine_laser_relay") + .withText(this.context().pageText())); + this.pageText(""" + The Prismarine Laser Relay is a block that allows you to extend the range of your lasers. + Make sure to point the arrow in the right direction! + \\ + It is crafted using 6 Polish Prismarine blocks. + """); + this.page("laser_junction0", () -> BookCraftingRecipePageModel.create() + .withTitle1("Laser Junction") + .withRecipeId1("nautec:laser_junction") + .withText(this.context.pageText())); + this.pageText(""" + The Laser Junction is a block that allows you to split a laser beam into multiple directions + or bundle multiple Beams into a single one. + """); + this.page("laser_junction1", () -> BookTextPageModel.create() + .withText(this.context.pageText())); + this.pageText(""" + Right-click or Shift-right-click to toggle input output on the blocks side. + While this block is quite expensive, it is also a useful and very powerful block to have. + """); } @Override diff --git a/src/main/java/com/portingdeadmods/nautec/content/blockentities/multiblock/controller/DrainBlockEntity.java b/src/main/java/com/portingdeadmods/nautec/content/blockentities/multiblock/controller/DrainBlockEntity.java index 68a1c5a7..a768685f 100644 --- a/src/main/java/com/portingdeadmods/nautec/content/blockentities/multiblock/controller/DrainBlockEntity.java +++ b/src/main/java/com/portingdeadmods/nautec/content/blockentities/multiblock/controller/DrainBlockEntity.java @@ -2,6 +2,7 @@ import com.google.common.collect.ImmutableMap; import com.portingdeadmods.nautec.api.blockentities.ContainerBlockEntity; +import com.portingdeadmods.nautec.api.blockentities.LaserBlockEntity; import com.portingdeadmods.nautec.api.blockentities.multiblock.MultiblockEntity; import com.portingdeadmods.nautec.api.multiblocks.MultiblockData; import com.portingdeadmods.nautec.capabilities.IOActions; @@ -11,6 +12,7 @@ import com.portingdeadmods.nautec.registries.NTFluids; import com.portingdeadmods.nautec.utils.BlockUtils; import it.unimi.dsi.fastutil.Pair; +import it.unimi.dsi.fastutil.objects.ObjectSet; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.HolderLookup; @@ -28,7 +30,7 @@ import org.jetbrains.annotations.Nullable; // TODO: Require power to work -public class DrainBlockEntity extends ContainerBlockEntity implements MultiblockEntity { +public class DrainBlockEntity extends LaserBlockEntity implements MultiblockEntity { private MultiblockData multiblockData; // TODO: Merge these variables @@ -90,6 +92,19 @@ private boolean hasWater() { return level.getBlockState(selfPos).getFluidState().is(FluidTags.WATER); } + @Override + public ObjectSet getLaserInputs() { + if (getBlockState().getValue(DrainMultiblock.FORMED)) { + return ObjectSet.of(Direction.NORTH, Direction.EAST, Direction.SOUTH, Direction.WEST); + } + return ObjectSet.of(); + } + + @Override + public ObjectSet getLaserOutputs() { + return ObjectSet.of(); + } + @Override public void commonTick() { super.commonTick(); @@ -106,7 +121,7 @@ private boolean openAndFormed() { private void performDraining() { // Every second - if (level.getGameTime() % 20 == 0 && lidInUse == 0) { + if (level.getGameTime() % 20 == 0 && lidInUse == 0 && getPower() > 15) { if (hasWater()) { if (openAndFormed()) { if (level.getBiome(worldPosition).is(BiomeTags.IS_OCEAN)) { diff --git a/src/main/java/com/portingdeadmods/nautec/content/blockentities/multiblock/part/DrainPartBlockEntity.java b/src/main/java/com/portingdeadmods/nautec/content/blockentities/multiblock/part/DrainPartBlockEntity.java index dfdb2a2a..50de5690 100644 --- a/src/main/java/com/portingdeadmods/nautec/content/blockentities/multiblock/part/DrainPartBlockEntity.java +++ b/src/main/java/com/portingdeadmods/nautec/content/blockentities/multiblock/part/DrainPartBlockEntity.java @@ -49,6 +49,9 @@ public ObjectSet getLaserInputs() { @Override public ObjectSet getLaserOutputs() { + if (laserPort != null) { + return ObjectSet.of(laserPort.getOpposite()); + } return ObjectSet.of(); } @@ -100,4 +103,10 @@ protected void saveData(CompoundTag tag, HolderLookup.Provider provider) { tag.putInt("laserPort", this.laserPort.ordinal()); } } + + @Override + public void commonTick() { + super.commonTick(); + transmitPower(getPower()); + } } diff --git a/src/main/java/com/portingdeadmods/nautec/datagen/RecipesProvider.java b/src/main/java/com/portingdeadmods/nautec/datagen/RecipesProvider.java index 8d8fe465..06fbe8da 100644 --- a/src/main/java/com/portingdeadmods/nautec/datagen/RecipesProvider.java +++ b/src/main/java/com/portingdeadmods/nautec/datagen/RecipesProvider.java @@ -480,24 +480,14 @@ private static void divingArmorRecipes(@NotNull RecipeOutput pRecipeOutput) { .duration(200) .save(pRecipeOutput); - ShapedRecipeBuilder.shaped(RecipeCategory.MISC, NTItems.ETCHING_ACID_BUCKET.get(), 1) - .pattern("ACE") - .pattern("HBD") - .pattern("IGF") - .define('A', Items.POISONOUS_POTATO) - .define('B', Items.WATER_BUCKET) - .define('C', Items.COPPER_INGOT) - .define('D', Items.REDSTONE) - .define('E', Items.GLOWSTONE_DUST) - .define('F', Items.BLAZE_POWDER) - .define('G', Items.GUNPOWDER) - .define('H', Items.BLAZE_POWDER) - .define('I', Items.BONE_MEAL) - - - .unlockedBy("has_item", has(NTItems.BROWN_POLYMER)) + ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, NTItems.ETCHING_ACID_BUCKET) + .requires(Items.POISONOUS_POTATO) + .requires(Items.GUNPOWDER) + .requires(Items.BONE_MEAL) + .requires(Items.WATER_BUCKET) + .requires(Items.REDSTONE) + .unlockedBy("has_item", has(Items.POISONOUS_POTATO)) .save(pRecipeOutput); - } private static void chemistryRecipes(@NotNull RecipeOutput pRecipeOutput) { @@ -510,6 +500,15 @@ private static void chemistryRecipes(@NotNull RecipeOutput pRecipeOutput) { .fluidIngredient(new FluidStack(NTFluids.SALT_WATER_SOURCE.get(), 1000)) .fluidResult(new FluidStack(NTFluids.EAS_SOURCE.get(), 1000)) .save(pRecipeOutput); + + MixingRecipeBuilder.newRecipe(ItemStack.EMPTY) + .ingredients(iwcFromItemLike(Items.REDSTONE, 1), + iwcFromItemLike(Items.GUNPOWDER, 1), + iwcFromItemLike(Items.BONE_MEAL, 1)) + .duration(1200) + .fluidIngredient(new FluidStack(NTFluids.SALT_WATER_SOURCE.get(), 1000)) + .fluidResult(new FluidStack(NTFluids.ETCHING_ACID_SOURCE.get(), 1000)) + .save(pRecipeOutput); } private static void augmentationRecipes(@NotNull RecipeOutput pRecipeOutput) {