fixes

gradle.properties

@@ -18,7 +18,7 @@ loader_version_range=[4,)
 mod_id=nautec
 mod_name=NauTec
 mod_license=MIT
-mod_version=0.0.4
+mod_version=0.0.6
 mod_group_id=com.portingdeadmods.nautec
 mod_authors=Thepigcat76, Leclowndu93150, Ktpatient, Reclipse, Iglee42
 mod_description=Mod for the curseforge 2024 modjam

src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d

@@ -1 +1,16 @@
-// 1.21.1	2024-09-13T18:06:50.0655091	Loot Tables
+// 1.21.1	2024-09-29T02:27:34.286677852	Loot Tables
+41719eca89c8053e263d78613ee41d3d1597d2f8 data/nautec/loot_table/blocks/aquarine_steel_block.json
+0db317348cd6a30700738aad0c4ee8bf13bdda43 data/nautec/loot_table/blocks/augmentation_station.json
+89010d86a80ddcea039479bd7f53ac2a03cb959d data/nautec/loot_table/blocks/augmentation_station_extension.json
+1174573fcdf3f6ce8973ee45db6557634dcb4bda data/nautec/loot_table/blocks/augmentation_station_part.json
+41b64deb69add5aba548b36fb7de36f1bdcae2ba data/nautec/loot_table/blocks/charger.json
+fcf05cc18fcb8b9624d59dc8c707dc1c5620eb70 data/nautec/loot_table/blocks/chiseled_dark_prismarine.json
+f403acf76ab195da1607916f7678d6a1a79dcf25 data/nautec/loot_table/blocks/dark_prismarine_pillar.json
+70569a466f470b7160131c892029c4ccc54df2c2 data/nautec/loot_table/blocks/deep_sea_drain.json
+42e084ccc92c50847afd04f1906c864d1cfe8d40 data/nautec/loot_table/blocks/deep_sea_drain_wall.json
+e90a32f36ece9a0d7c78ed93505bccddc8d505ec data/nautec/loot_table/blocks/laser_junction.json
+e82dcfcfa3ad60ff3ab2eece61c4a426a72a4cb6 data/nautec/loot_table/blocks/long_distance_laser.json
+aebefb09b28c0e85666d103e15dcea0c2fecf572 data/nautec/loot_table/blocks/mixer.json
+de667d48405eca934d75fcf7c05a333f42a06c43 data/nautec/loot_table/blocks/polished_prismarine.json
+e8ee191fa32b03b0128ddb6946630c58a4159591 data/nautec/loot_table/blocks/prismarine_laser_relay.json
+a22ebcb1d9483dfaa403866787730f3582716c02 data/nautec/loot_table/blocks/prismarine_sand.json

src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

@@ -1,4 +1,4 @@
-// 1.21.1	2024-09-28T20:24:01.595561	Recipes
+// 1.21.1	2024-09-29T03:40:41.997981505	Recipes
 c01db9d69b288d37c769cf605b945ebf60a08e21 data/minecraft/advancement/recipes/misc/diving_chestplate.json
 36b0d6b627495be6eaf8d6e567f9c95bdb744f14 data/minecraft/advancement/recipes/misc/diving_chestplate_oxygen.json
 83753bf5ab777551fde11d26262c5f2b947f4a64 data/minecraft/recipe/diving_chestplate.json
@@ -39,10 +39,11 @@ f453783b629e6901fe593efb42e4a537f9a615fd data/nautec/advancement/recipes/misc/di
 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
@@ -56,7 +57,7 @@ d049fd8d89899cc0acf35826d38877b6f5f96b52 data/nautec/recipe/aquarine_steel_hoe.j
 6860ea83a5f2e2456e3c354312504dfa0b71c45e data/nautec/recipe/aquarine_steel_shovel.json
 926024e7a8d5a04b41c23abb433648dc81ccf699 data/nautec/recipe/aquarine_steel_sword.json
 78c4da26cb8c9f272043276502bbd017b1c163ea data/nautec/recipe/aquarine_steel_wrench.json
-40ab009fe23dfe1c6cf241102a93cca467946a06 data/nautec/recipe/aquatic_catalyst.json
+e5b299cdc66cfaa5d495fc6677a39188d7e05304 data/nautec/recipe/aquatic_catalyst.json
 a60abd473ea054db8b2b484be6948f74ef64abd7 data/nautec/recipe/aquatic_catalyst_channeling/kelp.json
 bea82f431ae6dd57d20317ed174d13f15bdf51a2 data/nautec/recipe/augmentation_station.json
 9c2bc24537825f94866e46c4d37cd820f1f59cc3 data/nautec/recipe/augmentation_station_extension.json
@@ -84,8 +85,9 @@ a4bdb97abe0834d405f7584452f78242585e02ff data/nautec/recipe/item_transformation/
 11d23344db3f6e98c1520328fd6c883bccd8ca57 data/nautec/recipe/long_distance_laser.json
 3c72510dc295062631bc9b6634d4a009e2b8f952 data/nautec/recipe/mixer.json
 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

src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8

@@ -1,2 +1,2 @@
-// 1.21.1	2024-09-28T23:09:05.3700034	Languages: en_us
-99240669252a7751efb24c6b9840e5cee67ee683 assets/nautec/lang/en_us.json
+// 1.21.1	2024-09-29T03:21:41.790165073	Languages: en_us
+56c2d57484bd05cadfedafdf710162fe3282cf0c assets/nautec/lang/en_us.json

src/generated/resources/.cache/eb748cc26e43de416ad491bd48ccca24d169a651

@@ -1,10 +1,9 @@
-// 1.21.1	2024-09-28T23:25:11.4454983	Books: nautec
+// 1.21.1	2024-09-29T03:21:41.786782575	Books: nautec
 6d944fd1b3f4f8d8baf18317dbdea1e50476ed05 data/nautec/modonomicon/books/nautec_guide/book.json
 ea5fe754ad19a1903e7a9d19f39e3b1488e59cfe data/nautec/modonomicon/books/nautec_guide/categories/getting_started.json
-39a8bd00ca1bcea47116cc4539d6b3c12c3a1119 data/nautec/modonomicon/books/nautec_guide/entries/getting_started/diving_gear.json
+840e237eb35798d6695b2c42abbeead5128626f3 data/nautec/modonomicon/books/nautec_guide/entries/getting_started/diving_gear.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
-40140193be4c48a3946a4eed262f6112a8b9d27d data/nautec/modonomicon/books/nautec_guide/entries/getting_started/laser_power.json
-9f4ec8803b2037cb66af69a9c61f6b61aff0f807 data/nautec/modonomicon/books/nautec_guide/entries/getting_started/monocle.json
-64e2f7b87ddb0f2dd0a3521147809265328217ee data/nautec/modonomicon/books/nautec_guide/entries/getting_started/structures.json
-5ef2adf3382b30f31a6233f15157b2fde45e0a6c data/nautec/modonomicon/books/nautec_guide/entries/getting_started/utils.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
+208abc52b3b1a594abae2333834da891aef78ac1 data/nautec/modonomicon/books/nautec_guide/entries/getting_started/structures.json

src/generated/resources/.cache/f83bc53783f4536650f3e5f325a6b323525edd42

@@ -1,3 +1,3 @@
-// 1.21.1	2024-09-22T14:49:29.49174699	Tags for minecraft:block mod id nautec
-08a3bdb8cfa504bcdb09537a786e2ec1c2711732 data/minecraft/tags/block/mineable/axe.json
-08a3bdb8cfa504bcdb09537a786e2ec1c2711732 data/minecraft/tags/block/mineable/pickaxe.json
+// 1.21.1	2024-09-29T02:27:34.288946156	Tags for minecraft:block mod id nautec
+99d67d9d09dd14a489ce0d572e353c65fb94dccd data/minecraft/tags/block/mineable/axe.json
+e7ba554b481c66cdb75ef7a6643162a06e4eb630 data/minecraft/tags/block/mineable/pickaxe.json

src/generated/resources/assets/nautec/lang/en_us.json

@@ -8,6 +8,9 @@
   "augment_slot.nautec.lung": "Lungs",
   "augment_slot.nautec.right_arm": "Right Arm",
   "augment_slot.nautec.right_leg": "Right Leg",
+  "augment_type.nautec.dolphin_fin": "Dolphin Fin",
+  "augment_type.nautec.drowned_lung": "Drowned Lung",
+  "augment_type.nautec.guardian_eye": "Guardian Eye",
   "block.nautec.aquarine_steel_block": "Aquarine Steel Block",
   "block.nautec.aquatic_catalyst": "Aquatic Catalyst",
   "block.nautec.augmentation_station": "Augmentation Station",
@@ -30,30 +33,28 @@
   "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.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.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",
   "book.nautec.nautec_guide.getting_started.introduction.name": "Introduction",
   "book.nautec.nautec_guide.getting_started.item_transformation.description": "It's a magic mod!",
-  "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 specific laser color or purity so be sure to check before crafting.\n",
+  "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_power.description": "Whoooooooosh",
-  "book.nautec.nautec_guide.getting_started.laser_power.intro.text": "LAZZAAAA POWAH",
-  "book.nautec.nautec_guide.getting_started.laser_power.intro.title": "Laser Power",
+  "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.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",
   "book.nautec.nautec_guide.getting_started.monocle.name": "Prismarine Monocle",
   "book.nautec.nautec_guide.getting_started.name": "Getting Started",
   "book.nautec.nautec_guide.getting_started.structures.description": "Structures that you will come across on your journey through the oceans",
+  "book.nautec.nautec_guide.getting_started.structures.geode.text": "Around the crystal there is also a variety of loot. The crystal itself is surrounded with scaffolding which might be useful\nlater on...\n\\\n\\\nEdit: Do NOT break the crystal (yet) as it seems to shatter completely, without leaving anything behind.\n",
+  "book.nautec.nautec_guide.getting_started.structures.geode.title": "Deep Sea Structures",
   "book.nautec.nautec_guide.getting_started.structures.name": "Structures",
-  "book.nautec.nautec_guide.getting_started.structures.structures.text": "On your journey you will find a variety of structures located in the ocean...",
-  "book.nautec.nautec_guide.getting_started.structures.structures.title": "Structures in the abyss",
-  "book.nautec.nautec_guide.getting_started.utils.description": "Useful, Trust me.",
-  "book.nautec.nautec_guide.getting_started.utils.name": "Utility Items",
-  "book.nautec.nautec_guide.getting_started.utils.utils.text": "Wrench, Crowbar, and more!",
-  "book.nautec.nautec_guide.getting_started.utils.utils.title": "Utility Item",
+  "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.name": "Nautec Guide",
   "book.nautec.nautec_guide.tooltip": "Nautec Guide Tooltip",
   "curios.identifier.battery": "Battery",

src/generated/resources/data/minecraft/tags/block/mineable/axe.json

@@ -1,5 +1,6 @@
 {
   "values": [
-    "nautec:crate"
+    "nautec:crate",
+    "nautec:rusty_crate"
   ]
 }

src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json

@@ -1,5 +1,22 @@
 {
   "values": [
-    "nautec:crate"
+    "nautec:crate",
+    "nautec:rusty_crate",
+    "nautec:dark_prismarine_pillar",
+    "nautec:chiseled_dark_prismarine",
+    "nautec:polished_prismarine",
+    "nautec:aquarine_steel_block",
+    "nautec:aquatic_catalyst",
+    "nautec:prismarine_laser_relay",
+    "nautec:mixer",
+    "nautec:charger",
+    "nautec:long_distance_laser",
+    "nautec:laser_junction",
+    "nautec:deep_sea_drain",
+    "nautec:deep_sea_drain_wall",
+    "nautec:deep_sea_drain_part",
+    "nautec:augmentation_station",
+    "nautec:augmentation_station_extension",
+    "nautec:augmentation_station_part"
   ]
 }

src/generated/resources/data/nautec/modonomicon/books/nautec_guide/entries/getting_started/diving_gear.json

@@ -42,7 +42,7 @@
     }
   ],
   "show_when_any_parent_unlocked": false,
-  "sort_number": 6,
+  "sort_number": 5,
   "x": 2,
-  "y": 2
+  "y": -2
 }

src/generated/resources/data/nautec/modonomicon/books/nautec_guide/entries/getting_started/laser_power.json

@@ -19,6 +19,17 @@
       "text": "book.nautec.nautec_guide.getting_started.laser_power.intro.text",
       "title": "book.nautec.nautec_guide.getting_started.laser_power.intro.title",
       "use_markdown_in_title": false
+    },
+    {
+      "type": "modonomicon:crafting_recipe",
+      "anchor": "",
+      "condition": {
+        "type": "modonomicon:none"
+      },
+      "recipe_id_1": "nautec:aquatic_catalyst",
+      "text": "It can be accomplished by supplying the catalyst with fuel, like for\nexample Kelp and activating it with a Heart Of the Sea.\n\\\nAfter right-clicking the item on the catalyst, a laser beam will shoot\nout of the opposite side as long as it has a target.\n",
+      "title1": "Aquatic Catalyst",
+      "title2": ""
     }
   ],
   "parents": [

src/generated/resources/data/nautec/modonomicon/books/nautec_guide/entries/getting_started/monocle.json

@@ -41,7 +41,7 @@
     }
   ],
   "show_when_any_parent_unlocked": false,
-  "sort_number": 5,
+  "sort_number": 4,
   "x": 4,
   "y": 2
 }

src/generated/resources/data/nautec/modonomicon/books/nautec_guide/entries/getting_started/structures.json

@@ -19,6 +19,17 @@
       "text": "book.nautec.nautec_guide.getting_started.structures.structures.text",
       "title": "book.nautec.nautec_guide.getting_started.structures.structures.title",
       "use_markdown_in_title": false
+    },
+    {
+      "type": "modonomicon:text",
+      "anchor": "",
+      "condition": {
+        "type": "modonomicon:none"
+      },
+      "show_title_separator": true,
+      "text": "book.nautec.nautec_guide.getting_started.structures.geode.text",
+      "title": "book.nautec.nautec_guide.getting_started.structures.geode.title",
+      "use_markdown_in_title": false
     }
   ],
   "parents": [

src/generated/resources/data/nautec/recipe/aquatic_catalyst.json

@@ -11,7 +11,7 @@
   },
   "pattern": [
     "PDP",
-    "DPD",
+    "D D",
     "PDP"
   ],
   "result": {

src/main/java/com/portingdeadmods/nautec/api/blockentities/ContainerBlockEntity.java

@@ -233,8 +233,10 @@ public void onHeatChanged() {
 
     public void drop() {
         ItemStack[] stacks = getItemHandlerStacks();
-        SimpleContainer inventory = new SimpleContainer(stacks);
-        Containers.dropContents(this.level, this.worldPosition, inventory);
+        if (stacks != null) {
+            SimpleContainer inventory = new SimpleContainer(stacks);
+            Containers.dropContents(this.level, this.worldPosition, inventory);
+        }
     }
 
     public @Nullable ItemStack[] getItemHandlerStacks() {

src/main/java/com/portingdeadmods/nautec/api/blocks/blockentities/ContainerBlock.java

@@ -47,13 +47,13 @@ public <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level level, Block
 
     @Override
     public void onRemove(BlockState state, Level level, BlockPos pos, BlockState newState, boolean movedByPiston) {
-        super.onRemove(state, level, pos, newState, movedByPiston);
         BlockEntity be = level.getBlockEntity(pos);
         if (be instanceof ContainerBlockEntity containerBE) {
             if (!state.is(newState.getBlock())) {
                 containerBE.drop();
             }
         }
+        super.onRemove(state, level, pos, newState, movedByPiston);
     }
 
     @Override

src/main/java/com/portingdeadmods/nautec/compat/jei/NTJeiPlugin.java

@@ -82,6 +82,9 @@ public void registerRecipes(IRecipeRegistration registration) {
         for (AugmentationRecipe recipe : augmentationRecipes) {
             registration.addIngredientInfo(recipe.augmentItem().getDefaultInstance(), VanillaTypes.ITEM_STACK, Component.translatable(recipe.desc()));
         }
+
+        registration.addIngredientInfo(NTItems.PRISMARINE_CRYSTAL_SHARD.toStack(), VanillaTypes.ITEM_STACK,
+                Component.literal("Prismarine Crystal Shards are pristine crystals, capable of channeling power like no other material. They can be obtained by breaking a prismarine crystal using an Aquarine Steel Pickaxe with its ability enabled."));
     }
 
     @Override

src/main/java/com/portingdeadmods/nautec/compat/modonomicon/datagen/book/nautec_guide/GettingStartedCategory.java

@@ -33,13 +33,10 @@ protected void generateEntries() {
         BookEntryModel itemTransformationEntry = new ItemTransformationEntry(this)
                 .generate(new Vec2(6, 0));
         add(itemTransformationEntry.withParent(laserPowerEntry));
-        BookEntryModel utilsEntry = new UtilsEntry(this)
-                .generate(new Vec2(0, -2));
-        add(utilsEntry.withParent(introductionEntry));
         BookEntryModel monocleEntry = new MonocleEntry(this)
                 .generate(new Vec2(4, 2));
         add(monocleEntry.withParent(itemTransformationEntry));
-        BookEntryModel divingGear = new DivingGearEntry(this).generate(new Vec2(2, 2));
+        BookEntryModel divingGear = new DivingGearEntry(this).generate(new Vec2(2, -2));
         add(divingGear.withParent(introductionEntry));
     }