Merge remote-tracking branch 'origin/main'

Porting-Dead-Mods · Feb 16, 2025 · becaeb3 · becaeb3
2 parents 2a8d088 + d7ebc07
commit becaeb3
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 29 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -18,7 +18,7 @@ loader_version_range=[4,)
 mod_id=nautec
 mod_name=NauTec
 mod_license=MIT
-mod_version=0.2.0
+mod_version=0.2.1
 mod_group_id=com.portingdeadmods.nautec
 mod_authors=Thepigcat76, Leclowndu93150, Ktpatient, Reclipse, Iglee42
 mod_description=Mod for the curseforge 2024 modjam

diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d
@@ -1,4 +1,4 @@
-// 1.21.1	2025-02-13T16:20:06.179721876	Loot Tables
+// 1.21.1	2025-02-15T17:05:53.9684717	Loot Tables
 41719eca89c8053e263d78613ee41d3d1597d2f8 data/nautec/loot_table/blocks/aquarine_steel_block.json
 b0138d22def1a787c4e45722fc046c703e36ec05 data/nautec/loot_table/blocks/aquatic_catalyst.json
 0db317348cd6a30700738aad0c4ee8bf13bdda43 data/nautec/loot_table/blocks/augmentation_station.json
@@ -7,7 +7,7 @@ b0138d22def1a787c4e45722fc046c703e36ec05 data/nautec/loot_table/blocks/aquatic_c
 f590095e056ddb51aef96b87bf337447cbb85998 data/nautec/loot_table/blocks/bacterial_analyzer.json
 b4bac023a4f195fa3a312ed980d8a26b459db016 data/nautec/loot_table/blocks/bacterial_containment_shield.json
 5532fca7dd0fb0de5e8e4dac9e513362ac3b5fe3 data/nautec/loot_table/blocks/bio_reactor.json
-f0d425212575ef5fb38da0bc73965369875e8838 data/nautec/loot_table/blocks/bio_reactor_part.json
+a824fd5c006d74851f431f11dbaa556f150323a5 data/nautec/loot_table/blocks/bio_reactor_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

diff --git a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8
@@ -1,2 +1,2 @@
-// 1.21.1	2025-02-13T16:21:53.5456447	Languages: en_us
-950abf332083778317b4193f554cf38a6dd5eb09 assets/nautec/lang/en_us.json
+// 1.21.1	2025-02-15T17:05:53.9704658	Languages: en_us
+a384f70240e2d5c5864cec01d8f5a5f39e7ef565 assets/nautec/lang/en_us.json
diff --git a/src/generated/resources/.cache/eb748cc26e43de416ad491bd48ccca24d169a651 b/src/generated/resources/.cache/eb748cc26e43de416ad491bd48ccca24d169a651
@@ -1,21 +1,21 @@
-// 1.21.1	2025-02-13T15:39:16.717884477	Books: nautec
+// 1.21.1	2025-02-15T17:05:53.9664771	Books: nautec
 6d944fd1b3f4f8d8baf18317dbdea1e50476ed05 data/nautec/modonomicon/books/nautec_guide/book.json
 bcc5a52bdf7c614090d0effb5a1466169b55202f data/nautec/modonomicon/books/nautec_guide/categories/aquatic_biology.json
 ea5fe754ad19a1903e7a9d19f39e3b1488e59cfe data/nautec/modonomicon/books/nautec_guide/categories/getting_started.json
 017114f8211380a5e6b99895135d3a39018dd3e3 data/nautec/modonomicon/books/nautec_guide/categories/laser_augmentation.json
 3b186e166ff5703903304a77e793b8364cd2a0b7 data/nautec/modonomicon/books/nautec_guide/categories/laser_chemistry.json
+43d41666275648fc14a9cde7533507394a240f91 data/nautec/modonomicon/books/nautec_guide/entries/aquatic_biology/bacterial_analyzer.json
 5437d8bd93e4dccdc57d67faea67daa8db2af9ae data/nautec/modonomicon/books/nautec_guide/entries/aquatic_biology/bacteria_grafting.json
 019a8ae77eebfef64cdaff80c448ccfaf65d348f data/nautec/modonomicon/books/nautec_guide/entries/aquatic_biology/bacteria_introduction.json
 5790c9aab4047379af77fcd7bce84021d8091fbe data/nautec/modonomicon/books/nautec_guide/entries/aquatic_biology/bacteria_stats.json
-43d41666275648fc14a9cde7533507394a240f91 data/nautec/modonomicon/books/nautec_guide/entries/aquatic_biology/bacterial_analyzer.json
 0c4ae24d2950f16a4820c88ebe90333d8a65d01b data/nautec/modonomicon/books/nautec_guide/entries/aquatic_biology/bio_reactor.json
 0f20dba3b7127f33e5a32f79a11abad14f4e68b9 data/nautec/modonomicon/books/nautec_guide/entries/aquatic_biology/incubator.json
 776ec77cab5127c3ca65cb6a2f9e48fb0a4f1c80 data/nautec/modonomicon/books/nautec_guide/entries/aquatic_biology/mutator.json
-98dbf5868dbe3b0b587f88eb06c9b85942ab191f data/nautec/modonomicon/books/nautec_guide/entries/getting_started/diving_gear.json
+6a160fb74c301cc264188395c8fe7bd3439e1f77 data/nautec/modonomicon/books/nautec_guide/entries/getting_started/diving_gear.json
 c6142863ec08fd6aee8988857e6556a341aabddd data/nautec/modonomicon/books/nautec_guide/entries/getting_started/etching.json
 3025c1f954bcbae17b5500c8814af26ccda6cf0a data/nautec/modonomicon/books/nautec_guide/entries/getting_started/introduction.json
 9b9ae90af0d1516102afdceba92ac1383a664e3c data/nautec/modonomicon/books/nautec_guide/entries/getting_started/item_transformation.json
-dff48f829bfadb1ba902046365acfeb04971360a data/nautec/modonomicon/books/nautec_guide/entries/getting_started/laser_power.json
+6d12ba17c40d4ac9ee44593d9fbfcf309efe341e data/nautec/modonomicon/books/nautec_guide/entries/getting_started/laser_power.json
 0aa4ad03a3648d535a51168427dc105844f4effc data/nautec/modonomicon/books/nautec_guide/entries/getting_started/machine_part.json
 57e9beb4c73a9e888470b72a0aea5a8c7122f29a data/nautec/modonomicon/books/nautec_guide/entries/getting_started/monocle.json
 11b823451dc12b33e8fc0848f96cce6f937762e6 data/nautec/modonomicon/books/nautec_guide/entries/getting_started/structures.json

diff --git a/src/generated/resources/assets/nautec/lang/en_us.json b/src/generated/resources/assets/nautec/lang/en_us.json
@@ -137,7 +137,7 @@
   "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": "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.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",

diff --git a/src/generated/resources/data/nautec/loot_table/blocks/bio_reactor_part.json b/src/generated/resources/data/nautec/loot_table/blocks/bio_reactor_part.json
@@ -16,11 +16,11 @@
               "block": "nautec:bio_reactor_part",
               "condition": "minecraft:block_state_property",
               "properties": {
-                "bio_reactor_part": "0"
+                "bio_reactor_part": "5"
               }
             }
           ],
-          "name": "nautec:dark_prismarine_pillar"
+          "name": "nautec:bacterial_containment_shield"
         },
         {
           "type": "minecraft:item",
@@ -29,11 +29,11 @@
               "block": "nautec:bio_reactor_part",
               "condition": "minecraft:block_state_property",
               "properties": {
-                "bio_reactor_part": "1"
+                "bio_reactor_part": "6"
               }
             }
           ],
-          "name": "nautec:bacterial_containment_shield"
+          "name": "nautec:dark_prismarine_pillar"
         },
         {
           "type": "minecraft:item",
@@ -42,11 +42,11 @@
               "block": "nautec:bio_reactor_part",
               "condition": "minecraft:block_state_property",
               "properties": {
-                "bio_reactor_part": "2"
+                "bio_reactor_part": "7"
               }
             }
           ],
-          "name": "nautec:dark_prismarine_pillar"
+          "name": "nautec:bacterial_containment_shield"
         },
         {
           "type": "minecraft:item",
@@ -55,11 +55,11 @@
               "block": "nautec:bio_reactor_part",
               "condition": "minecraft:block_state_property",
               "properties": {
-                "bio_reactor_part": "3"
+                "bio_reactor_part": "8"
               }
             }
           ],
-          "name": "nautec:bacterial_containment_shield"
+          "name": "nautec:dark_prismarine_pillar"
         },
         {
           "type": "minecraft:item",
@@ -68,11 +68,11 @@
               "block": "nautec:bio_reactor_part",
               "condition": "minecraft:block_state_property",
               "properties": {
-                "bio_reactor_part": "4"
+                "bio_reactor_part": "0"
               }
             }
           ],
-          "name": "nautec:polished_prismarine"
+          "name": "nautec:dark_prismarine_pillar"
         },
         {
           "type": "minecraft:item",
@@ -81,7 +81,7 @@
               "block": "nautec:bio_reactor_part",
               "condition": "minecraft:block_state_property",
               "properties": {
-                "bio_reactor_part": "5"
+                "bio_reactor_part": "1"
               }
             }
           ],
@@ -94,7 +94,7 @@
               "block": "nautec:bio_reactor_part",
               "condition": "minecraft:block_state_property",
               "properties": {
-                "bio_reactor_part": "6"
+                "bio_reactor_part": "2"
               }
             }
           ],
@@ -107,7 +107,7 @@
               "block": "nautec:bio_reactor_part",
               "condition": "minecraft:block_state_property",
               "properties": {
-                "bio_reactor_part": "7"
+                "bio_reactor_part": "3"
               }
             }
           ],
@@ -120,11 +120,11 @@
               "block": "nautec:bio_reactor_part",
               "condition": "minecraft:block_state_property",
               "properties": {
-                "bio_reactor_part": "8"
+                "bio_reactor_part": "4"
               }
             }
           ],
-          "name": "nautec:dark_prismarine_pillar"
+          "name": "nautec:polished_prismarine"
         }
       ],
       "rolls": 1.0

diff --git a/...urces/data/nautec/modonomicon/books/nautec_guide/entries/getting_started/laser_power.json b/...urces/data/nautec/modonomicon/books/nautec_guide/entries/getting_started/laser_power.json
@@ -27,7 +27,7 @@
         "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",
+      "text": "It can be accomplished by supplying the catalyst with fuel, like for example some prismarine.\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": ""
     },

diff --git a/.../nautec/compat/modonomicon/datagen/book/nautec_guide/getting_started/LaserPowerEntry.java b/.../nautec/compat/modonomicon/datagen/book/nautec_guide/getting_started/LaserPowerEntry.java
@@ -22,7 +22,7 @@ protected void generatePages() {
         this.pageTitle("An Introduction to Laser Power");
         this.pageText("""
                 Lasers are a mysterious technology. Nobody really knows
-                exactly how to create them. However using some prismarine
+                exactly how to create them. However using some prismarine,
                 both dark and light, one is able to create an Aquatic Catalyst.
                 \\
                 While this block itself does not possesses the ability to channel
@@ -32,8 +32,7 @@ protected void generatePages() {
                 .withTitle1("Aquatic Catalyst")
                 .withRecipeId1("nautec:aquatic_catalyst")
                 .withText("""
-                        It can be accomplished by supplying the catalyst with fuel, like for
-                        example Kelp and activating it with a Heart Of the Sea.
+                        It can be accomplished by supplying the catalyst with fuel, like for example some prismarine.
                         \\
                         After right-clicking the item on the catalyst, a laser beam will shoot
                         out of the opposite side as long as it has a target.