Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
Thepigcat76 committed Sep 29, 2024
2 parents 8ce14e2 + 0cc8427 commit d5c80db
Show file tree
Hide file tree
Showing 36 changed files with 830 additions and 87 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// 1.21.1 2024-09-29T09:20:10.1575481 Registries
d3949aab832fc1b72c2512c35586c2682dea4d4d data/nautec/worldgen/configured_feature/prismarine_sand_beach.json
e9f0c0ce377bc6f731c3b36673e845152a53327d data/nautec/worldgen/configured_feature/prismarine_sand_ocean.json
61beaaac7a98b48f9100d5a9ea42e62226e2222d data/nautec/worldgen/placed_feature/prismarine_sand_beach.json
21d49b85293b9e51f7fa1053674456997be8ebb2 data/nautec/worldgen/placed_feature/prismarine_sand_ocean.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
// 1.21.1 2024-09-29T03:40:41.997981505 Recipes
// 1.21.1 2024-09-29T10:20:47.3671384 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
36b0d6b627495be6eaf8d6e567f9c95bdb744f14 data/minecraft/advancement/recipes/misc/diving_chestplate_oxygen.json
e83432cfbd30246a5c90a4dadb7cddc68eb41776 data/minecraft/recipe/cast_iron_ingot_blasting.json
5d8fdeabdc238a5b557a2a159a9ccb30e723703b data/minecraft/recipe/cast_iron_nugget_to_ingot.json
83753bf5ab777551fde11d26262c5f2b947f4a64 data/minecraft/recipe/diving_chestplate.json
d9bd5ed8d761638f07ac753459c333be5e11032b data/minecraft/recipe/diving_chestplate_oxygen.json
0eb4bd206062b5348bb5c146f2800fd99b43042b data/minecraft/recipe/dolphin_fin.json
Expand All @@ -22,7 +26,6 @@ d105bf1507d29e8c1a25eea476d5566745ca84a9 data/nautec/advancement/recipes/misc/aq
4892a02e14ac5f73378727582505c2c6f671e254 data/nautec/advancement/recipes/misc/augmentation_station.json
b52be24dd909e8a30bc3be0e4b48f5336cc80fab data/nautec/advancement/recipes/misc/augmentation_station_extension.json
0a69ce6ebf4eb3fdd0643da2840333fb3e81731d data/nautec/advancement/recipes/misc/brown_polymer.json
102e9562fe6a4da921dbddff4699fab974b7d757 data/nautec/advancement/recipes/misc/cast_iron_ingot.json
d6a6420d783a5714529e18ba05f0382124f3c4e0 data/nautec/advancement/recipes/misc/cast_iron_nugget.json
939b8a71fa717c6f77dc521309a69952dd701da4 data/nautec/advancement/recipes/misc/cast_iron_rod.json
80c335c97a3e51847dd873dc952a31379bb96d95 data/nautec/advancement/recipes/misc/charger.json
Expand All @@ -35,15 +38,16 @@ 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
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
fa6493a3ef0380850872951ce297171d1708ce63 data/nautec/advancement/recipes/misc/mixer.json
94885315f77dd2362883172287de15e80f1a6e7b data/nautec/advancement/recipes/misc/nautec_guide.json
8c227a8c475e21c750c907230ff6420791f780d6 data/nautec/advancement/recipes/misc/polished_prismarine.json
8b0963164bc58a64ef675d369ac6f4221b8cbebb data/nautec/advancement/recipes/misc/prism_monocle.json
03abc1a326810daa2cccf6acf1d21a55d776bd8b data/nautec/advancement/recipes/misc/prismarine_laser_relay.json
1eb85648ed5c154f0a465c787ef1cfd4542c3572 data/nautec/advancement/recipes/misc/prismatic_battery.json
8b0963164bc58a64ef675d369ac6f4221b8cbebb data/nautec/advancement/recipes/misc/prism_monocle.json
df1f62063c751d0d6939426505f6bb14f6ae7382 data/nautec/advancement/recipes/misc/whisk.json
2edaf56a3e57123c7fea16bceccd4e1b956d7679 data/nautec/recipe/aquarine_steel_axe.json
ac856492b21e9245de0ba2edcbeda8bc2b06c7fd data/nautec/recipe/aquarine_steel_block.json
Expand All @@ -62,7 +66,6 @@ a60abd473ea054db8b2b484be6948f74ef64abd7 data/nautec/recipe/aquatic_catalyst_cha
bea82f431ae6dd57d20317ed174d13f15bdf51a2 data/nautec/recipe/augmentation_station.json
9c2bc24537825f94866e46c4d37cd820f1f59cc3 data/nautec/recipe/augmentation_station_extension.json
b2cb1d73b9e1e2104af451250ff4464197c45531 data/nautec/recipe/brown_polymer.json
5d8fdeabdc238a5b557a2a159a9ccb30e723703b data/nautec/recipe/cast_iron_ingot.json
0e7ac319099e484ba772e18754213fe7009a42cd data/nautec/recipe/cast_iron_nugget.json
54fa00f5e878d9324e9c7d03d3e521da24bcd65f data/nautec/recipe/cast_iron_rod.json
a1104a2fca829ca101471417232e05510e405423 data/nautec/recipe/charger.json
Expand All @@ -75,6 +78,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
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
Expand All @@ -87,7 +91,7 @@ a4bdb97abe0834d405f7584452f78242585e02ff data/nautec/recipe/item_transformation/
35a2d38352317596d0e56958db954ee65944fd30 data/nautec/recipe/mixing/dried_kelp_slime_ball_prismarine_crystals_seagrass.json
674df651148d747a200794f496996b82ca94e72f data/nautec/recipe/nautec_guide.json
cd9bfbdf0f0468399cc4700d0c360b8283253c96 data/nautec/recipe/polished_prismarine.json
4fe8f6115c759c654e132afedec76d846f0a89d5 data/nautec/recipe/prism_monocle.json
ac628b97c097227e3af94f13cbe35a2cf3ee3124 data/nautec/recipe/prismarine_laser_relay.json
4745c9855337a311cb5b7211168927a61645d193 data/nautec/recipe/prismatic_battery.json
4fe8f6115c759c654e132afedec76d846f0a89d5 data/nautec/recipe/prism_monocle.json
266c89a0698de108847ad3b60be50d230822cee4 data/nautec/recipe/whisk.json
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.21.1 2024-09-29T03:21:41.790165073 Languages: en_us
56c2d57484bd05cadfedafdf710162fe3282cf0c assets/nautec/lang/en_us.json
// 1.21.1 2024-09-29T11:46:44.5605123 Languages: en_us
91c6589fa90a72ca33838d000724025553316a4f assets/nautec/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
// 1.21.1 2024-09-29T03:21:41.786782575 Books: nautec
// 1.21.1 2024-09-29T11:52:01.6465265 Books: nautec
6d944fd1b3f4f8d8baf18317dbdea1e50476ed05 data/nautec/modonomicon/books/nautec_guide/book.json
ea5fe754ad19a1903e7a9d19f39e3b1488e59cfe data/nautec/modonomicon/books/nautec_guide/categories/getting_started.json
840e237eb35798d6695b2c42abbeead5128626f3 data/nautec/modonomicon/books/nautec_guide/entries/getting_started/diving_gear.json
33d4b677fbd132b7845a456bfd7982547349c587 data/nautec/modonomicon/books/nautec_guide/entries/getting_started/etching.json
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
836ca05eab6d177f97c092588df2c03e27021d66 data/nautec/modonomicon/books/nautec_guide/entries/getting_started/laser_manipulation.json
7c1359fceaa3b513a15df94a5eb6811d624a1ad4 data/nautec/modonomicon/books/nautec_guide/entries/getting_started/laser_power.json
4587f6a0b818015ee60e5ab7c98a879612fbbb14 data/nautec/modonomicon/books/nautec_guide/entries/getting_started/monocle.json
307bdce415e37b7c8f8298389c0978afdb36815c data/nautec/modonomicon/books/nautec_guide/entries/getting_started/mixer.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
21 changes: 21 additions & 0 deletions src/generated/resources/assets/nautec/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"block.nautec.augmentation_station": "Augmentation Station",
"block.nautec.augmentation_station_extentsion": "Augmentation Station Extension",
"block.nautec.augmentation_station_part": "Augmentation Station",
"block.nautec.charger": "Charger",
"block.nautec.chiseled_dark_prismarine": "Chiseled Dark Prismarine",
"block.nautec.crate": "Crate",
"block.nautec.dark_prismarine_pillar": "Dark Prismarine Pillar",
Expand All @@ -27,11 +28,15 @@
"block.nautec.polished_prismarine": "Polished Prismarine",
"block.nautec.prismarine_crystal": "Prismarine Crystal",
"block.nautec.prismarine_laser_relay": "Prismarine Laser Relay",
"block.nautec.prismarine_sand": "Prismarine Sand",
"block.nautec.rusty_crate": "Rusty Crate",
"book.nautec.nautec_guide.getting_started.diving_gear.description": "Explore the depths of the ocean",
"book.nautec.nautec_guide.getting_started.diving_gear.diving.text": "The Diving Suit is a special suit that allows you to explore the depths of the ocean.\n\\\nCrafted from a special Polymer material, the Diving Suit is must-have for any underwater explorer.\n\\\nThe Helmet will clear your vision underwater while the chestplate will provide you with 10min of oxygen.\n",
"book.nautec.nautec_guide.getting_started.diving_gear.diving.title": "Diving Gear",
"book.nautec.nautec_guide.getting_started.diving_gear.name": "Diving Suit and Oxygen",
"book.nautec.nautec_guide.getting_started.etching.description": "Feels like brand new!",
"book.nautec.nautec_guide.getting_started.etching.etching.text": "Etching is a mechanic that allows you to remove the rust from rusty objects.\n\\\nThe process is simple, by dropping a rusty crate or item into a pool of etching acid, the rust will slowly disappear, and a new shiny object will emerge.\n\\\nYou probably noticed that the crates are locked, and you can't open them. This is because the lock is messed up and needs a crowbar to be removed.\n",
"book.nautec.nautec_guide.getting_started.etching.name": "Crate & Item Etching",
"book.nautec.nautec_guide.getting_started.introduction.description": "Intro desc",
"book.nautec.nautec_guide.getting_started.introduction.intro.text": "Greetings Traveller,\n\\\nit seems like you have obtained\nmy book. I hope to explain my discoveries\nabout the vast underwater world and how to leverage them in it.\n\\\n\\\nTo make this easier to follow along I have decided to structure\nit in a way that allows for easy understanding and\nreplication of my steps.\n",
"book.nautec.nautec_guide.getting_started.introduction.intro.title": "Introduction",
Expand All @@ -40,10 +45,17 @@
"book.nautec.nautec_guide.getting_started.item_transformation.item_transformation.text": "Item transformation works by shooting lasers at items to transform them into other items.\n\\\n\\\nSome recipes may require a certain level of purity so be sure to check before crafting.\n",
"book.nautec.nautec_guide.getting_started.item_transformation.item_transformation.title": "Item Transformation",
"book.nautec.nautec_guide.getting_started.item_transformation.name": "Item Transformation",
"book.nautec.nautec_guide.getting_started.laser_manipulation.description": "Playing with Lasers !",
"book.nautec.nautec_guide.getting_started.laser_manipulation.laser_manipulation.text": "The Prismarine Laser Relay is a block that allows you to extend the range of your lasers.\n Make 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.getting_started.laser_manipulation.laser_manipulation.title": "Laser Manipulation",
"book.nautec.nautec_guide.getting_started.laser_manipulation.name": "Laser Manipulation",
"book.nautec.nautec_guide.getting_started.laser_power.description": "Whoooooooosh",
"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.mixer.description": "Mixing my way through the ocean",
"book.nautec.nautec_guide.getting_started.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\\\nIts main purpose is to craft the Electrolyte Algae Serum, used to infuse tools to unlock their full potential.\n",
"book.nautec.nautec_guide.getting_started.mixer.name": "The Mixer",
"book.nautec.nautec_guide.getting_started.monocle.description": "The Third 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",
Expand All @@ -55,6 +67,10 @@
"book.nautec.nautec_guide.getting_started.structures.name": "Structures",
"book.nautec.nautec_guide.getting_started.structures.structures.text": "The first step to unlocking Aquatic Power is to locate an ocean and to search for a small and unlikely structure.\n\\\nThe structure is mainly built out of dark prismarine with a mysterious device in the middle of the \"arch\"\nHowever, this structure should not be your main point of interest as below it, in a small radius, there often\nis a geode like cave, containing a mighty crystal.\n",
"book.nautec.nautec_guide.getting_started.structures.structures.title": "Deep Sea Structures",
"book.nautec.nautec_guide.getting_started.utilities.description": "Various QoL utilities",
"book.nautec.nautec_guide.getting_started.utilities.name": "Tools and Utilities",
"book.nautec.nautec_guide.getting_started.utilities.utilities.text": "The Aquarine Steel Wrench, can be used to rotate blocks and change modes on machinery, it can be crafted using 4 Aquarine Steel Ingots.\n\\\n\\\nThe crowbar is another useful tool that will allow you to open the many crates you will find in the ocean.\n",
"book.nautec.nautec_guide.getting_started.utilities.utilities.title": "Tools and Utilities",
"book.nautec.nautec_guide.name": "Nautec Guide",
"book.nautec.nautec_guide.tooltip": "Nautec Guide Tooltip",
"curios.identifier.battery": "Battery",
Expand All @@ -80,6 +96,7 @@
"item.nautec.atlantic_gold_nugget": "Atlantic Gold Nugget",
"item.nautec.broken_whisk": "Broken Whisk",
"item.nautec.brown_polymer": "Brown Polymer",
"item.nautec.burnt_coil": "Burnt Coil",
"item.nautec.cast_iron_ingot": "Cast Iron Ingot",
"item.nautec.cast_iron_nugget": "Cast Iron Nugget",
"item.nautec.cast_iron_rod": "Cast Iron Rod",
Expand All @@ -94,16 +111,20 @@
"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.eldritch_artifact": "Eldritch Artifact",
"item.nautec.etching_acid_bucket": "Etching Acid Bucket",
"item.nautec.gear": "Gear",
"item.nautec.glass_vial": "Glass Vial",
"item.nautec.guardian_eye": "Guardian Eye",
"item.nautec.laser_channeling_coil": "Laser Channeling Coil",
"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.valve": "Valve²",
"item.nautec.whisk": "Whisk",
"multiblock.info.actual_block": "Block: %s",
"multiblock.info.block_pos": "Coordinates: %d, %d, %d",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": "minecraft:iron_ingot"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "minecraft:cast_iron_ingot_blasting"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_item"
]
],
"rewards": {
"recipes": [
"minecraft:cast_iron_ingot_blasting"
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"has_the_recipe": {
"conditions": {
"recipe": "nautec:cast_iron_ingot"
"recipe": "minecraft:cast_iron_nugget_to_ingot"
},
"trigger": "minecraft:recipe_unlocked"
}
Expand All @@ -26,7 +26,7 @@
],
"rewards": {
"recipes": [
"nautec:cast_iron_ingot"
"minecraft:cast_iron_nugget_to_ingot"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"type": "minecraft:blasting",
"category": "misc",
"cookingtime": 10,
"experience": 2.0,
"ingredient": {
"tag": "c:ingots/iron"
},
"result": {
"count": 1,
"id": "nautec:cast_iron_ingot"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
"has_item": {
"conditions": {
"items": [
{
"items": "nautec:brown_polymer"
}
]
},
"trigger": "minecraft:inventory_changed"
},
"has_the_recipe": {
"conditions": {
"recipe": "nautec:etching_acid_bucket"
},
"trigger": "minecraft:recipe_unlocked"
}
},
"requirements": [
[
"has_the_recipe",
"has_item"
]
],
"rewards": {
"recipes": [
"nautec:etching_acid_bucket"
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"background_u_index": 0,
"background_v_index": 0,
"category": "getting_started",
"description": "book.nautec.nautec_guide.getting_started.etching.description",
"hide_while_locked": false,
"icon": {
"item": "nautec:rusty_crate"
},
"name": "book.nautec.nautec_guide.getting_started.etching.name",
"pages": [
{
"type": "modonomicon:text",
"anchor": "",
"condition": {
"type": "modonomicon:none"
},
"show_title_separator": true,
"text": "book.nautec.nautec_guide.getting_started.etching.etching.text",
"title": "book.nautec.nautec_guide.getting_started.etching.etching.title",
"use_markdown_in_title": false
},
{
"type": "modonomicon:crafting_recipe",
"anchor": "",
"condition": {
"type": "modonomicon:none"
},
"recipe_id_1": "nautec:etching_acid_bucket",
"text": "",
"title1": "Etching Acid Recipe",
"title2": ""
}
],
"parents": [
{
"draw_arrow": true,
"entry": "getting_started/structures",
"line_enabled": true,
"line_reversed": false
}
],
"show_when_any_parent_unlocked": false,
"sort_number": 8,
"x": 2,
"y": 2
}
Loading

0 comments on commit d5c80db

Please sign in to comment.