misc fixes

Porting-Dead-Mods · Sep 29, 2024 · a15e05f · a15e05f
1 parent ae1af38
commit a15e05f
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 6 deletions.
diff --git a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8
@@ -1,2 +1,2 @@
-// 1.21.1	2024-09-29T21:55:50.109163447	Languages: en_us
-5ce473ca5ad3304926718956675435f92baea109 assets/nautec/lang/en_us.json
+// 1.21.1	2024-09-29T22:11:39.263885614	Languages: en_us
+26ff09690c682bbc6ff1b31b17a6f887a53d5f90 assets/nautec/lang/en_us.json
diff --git a/src/generated/resources/.cache/eb748cc26e43de416ad491bd48ccca24d169a651 b/src/generated/resources/.cache/eb748cc26e43de416ad491bd48ccca24d169a651
@@ -1,4 +1,4 @@
-// 1.21.1	2024-09-29T21:55:50.102259945	Books: nautec
+// 1.21.1	2024-09-29T22:11:39.260838228	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,7 +8,7 @@ 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
+e14fe6ef8f7859e1cc70ec4136effe073aa2c58e 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
@@ -24,5 +24,5 @@ d70be2eaf9729ca163499da6d7a33730cf7e07f2 data/nautec/modonomicon/books/nautec_gu
 34c421cb513a6d5ac4631180a2bbd14aa09d021a data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/drain.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
+ff17de9e527f75fdbe8a985f0254ef4e5d0a3dd4 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/...rces/data/nautec/modonomicon/books/nautec_guide/entries/getting_started/machine_part.json b/...rces/data/nautec/modonomicon/books/nautec_guide/entries/getting_started/machine_part.json
@@ -19,6 +19,18 @@
       "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
+    },
+    {
+      "type": "modonomicon:spotlight",
+      "anchor": "",
+      "condition": {
+        "type": "modonomicon:none"
+      },
+      "item": {
+        "item": "nautec:burnt_coil"
+      },
+      "text": "",
+      "title": "book.nautec.nautec_guide.getting_started.machine_part.machine_part_examples.title"
     }
   ],
   "parents": [

diff --git a/...dmods/nautec/compat/modonomicon/datagen/book/nautec_guide/laser_chemistry/MixerEntry.java b/...dmods/nautec/compat/modonomicon/datagen/book/nautec_guide/laser_chemistry/MixerEntry.java
@@ -22,6 +22,9 @@ protected void generatePages() {
             this.pageText("""
                     The Mixer is a powerful machine that can mix and combine items in a variety of ways.
                     \\
+                    Materials can be inserted manually, note however that you can only input one ingredient
+                    per horizontal direction.
+                    \\
                     It requires laser power to operate. To display informations about the ongoing process, you can use the Monocle.
                     """);
             this.page("mixer_recipe", () -> BookCraftingRecipePageModel.create()

diff --git a/src/main/java/com/portingdeadmods/nautec/content/blocks/multiblock/part/DrainPartBlock.java b/src/main/java/com/portingdeadmods/nautec/content/blocks/multiblock/part/DrainPartBlock.java
@@ -167,7 +167,8 @@ protected void entityInside(BlockState state, Level level, BlockPos pos, Entity
 
     @Override
     protected void tick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) {
-        if (state.getValue(OPEN) && (state.getValue(DrainMultiblock.DRAIN_PART) == 4 || state.getValue(DrainMultiblock.DRAIN_PART) % 2 != 0)) {
+        DrainPartBlockEntity be = (DrainPartBlockEntity) level.getBlockEntity(pos);
+        if (be.getPower() > 15 && state.getValue(OPEN) && (state.getValue(DrainMultiblock.DRAIN_PART) == 4 || state.getValue(DrainMultiblock.DRAIN_PART) % 2 != 0)) {
             BubbleColumnBlock.updateColumn(level, pos.above(), state);
         }
     }