fix: remove duplicate book content

Closes #219
klikli-dev · Aug 29, 2024 · 14e11a6 · 14e11a6
1 parent e76ec74
commit 14e11a6
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 89 deletions.
diff --git a/src/generated/resources/.cache/3fa62e6e7a071b2d9f296990c67d7a2df0006913 b/src/generated/resources/.cache/3fa62e6e7a071b2d9f296990c67d7a2df0006913
@@ -1,14 +1,14 @@
-// 1.21.1	2024-08-16T15:38:30.3386581	Books: theurgy
+// 1.21.1	2024-08-29T18:41:12.7572969	Books: theurgy
 c473bf5aa94f847c736c37f1a9f85c86b8bce95d data/theurgy/modonomicon/books/the_hermetica/book.json
 74a2622bcd8dc6316c5977cbea5a026d81dcff87 data/theurgy/modonomicon/books/the_hermetica/categories/apparatus.json
 6f877a9734359091748cca949c8e6c569ad2d67e data/theurgy/modonomicon/books/the_hermetica/categories/getting_started.json
 c901ff2af9083916a51d916567c4d9475469ce80 data/theurgy/modonomicon/books/the_hermetica/categories/logistics.json
 b566a66d301147d1840b1ffd152d40d67b1213d4 data/theurgy/modonomicon/books/the_hermetica/entries/apparatus/basic_vat_automation.json
 1a046a57dc23b1db493fb013bb8969bdcad25cf7 data/theurgy/modonomicon/books/the_hermetica/entries/apparatus/calcination_oven.json
 6a4cf4119c1339960918069c955dd1db251d7a59 data/theurgy/modonomicon/books/the_hermetica/entries/apparatus/caloric_flux_emitter.json
-37e64e777d28f29d7f93a367ec34bbc26d1e1382 data/theurgy/modonomicon/books/the_hermetica/entries/apparatus/digestion_vat.json
+6e24d9f5f1baa3a9baf4c11e09cc1eab19abb62f data/theurgy/modonomicon/books/the_hermetica/entries/apparatus/digestion_vat.json
 48a7044e487fb09077768c0db0d3ed43521fa644 data/theurgy/modonomicon/books/the_hermetica/entries/apparatus/distiller.json
-19914c0b4232ec532259e83f59f8f6d99b30fdc4 data/theurgy/modonomicon/books/the_hermetica/entries/apparatus/fermentation_vat.json
+e6bed2f0f9fe593643d576d290659a22eb6144e2 data/theurgy/modonomicon/books/the_hermetica/entries/apparatus/fermentation_vat.json
 6029216b2e7451d17f6b01aff7bceb4c0c2fb169 data/theurgy/modonomicon/books/the_hermetica/entries/apparatus/how_to.json
 bc3437956682996470624842db82e9e476de4a3e data/theurgy/modonomicon/books/the_hermetica/entries/apparatus/incubator.json
 87b2f0e43694c7737da5aca929a619af194bd357 data/theurgy/modonomicon/books/the_hermetica/entries/apparatus/intro.json

diff --git a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8
@@ -1,2 +1,2 @@
-// 1.21.1	2024-08-20T17:19:37.857308	Languages: en_us
-b1ef74f7ba020c35f04430821d043095a9a08e80 assets/theurgy/lang/en_us.json
+// 1.21.1	2024-08-29T18:41:12.7618143	Languages: en_us
+3c485f76e1110d2b4929ef4619cd1099eb355163 assets/theurgy/lang/en_us.json
diff --git a/src/generated/resources/assets/theurgy/lang/en_us.json b/src/generated/resources/assets/theurgy/lang/en_us.json
@@ -115,8 +115,6 @@
   "book.theurgy.the_hermetica.apparatus.digestion_vat.name": "Digestion Vat",
   "book.theurgy.the_hermetica.apparatus.digestion_vat.process.text": "Unlike other apparatus the digestion vat only works when closed.\\\nShift-right-click with an empty hand to open or close the vat.\\\nWhen closed, no items or fluids can be put in or taken out.\n",
   "book.theurgy.the_hermetica.apparatus.digestion_vat.process.title": "Process",
-  "book.theurgy.the_hermetica.apparatus.digestion_vat.redstone.text": "The vat can be closed by applying a redstone signal (if a valid recipe is present).\\\nIf a redstone signal is applied and ingredients for a valid recipe are inserted, the vat will automatically close.\n\\\n\\\nIf the redstone signal is turned off the vat will open again.\n",
-  "book.theurgy.the_hermetica.apparatus.digestion_vat.redstone.title": "Redstone",
   "book.theurgy.the_hermetica.apparatus.digestion_vat.usage.text": "Place the vat on the ground.\\\nThen right-click it with the ingredients (usually an Alchemical Niter and [](item://theurgy:purified_gold))\\\nRight-click the block with a Sal Ammoniac bucket (or supply via pipes)\\\nShift-right-click the vat with an empty hand to close it.\n",
   "book.theurgy.the_hermetica.apparatus.digestion_vat.usage.title": "Usage",
   "book.theurgy.the_hermetica.apparatus.digestion_vat.usage2.text": "Both items and fluids can also be piped in and out of the vat, or hoppers can be used.\n",
@@ -133,10 +131,6 @@
   "book.theurgy.the_hermetica.apparatus.fermentation_vat.name": "Fermentation Vat",
   "book.theurgy.the_hermetica.apparatus.fermentation_vat.process.text": "Unlike other apparatus the fermentation vat only works when closed.\\\nShift-right-click with an empty hand to open or close the vat.\\\nWhen closed, no items or fluids can be put in or taken out.\n",
   "book.theurgy.the_hermetica.apparatus.fermentation_vat.process.title": "Process",
-  "book.theurgy.the_hermetica.apparatus.fermentation_vat.redstone_control.text": "The vat can be closed by applying a redstone signal (if a valid recipe is present).\\\nIf a redstone signal is applied and ingredients for a valid recipe are inserted, the vat will automatically close.\\\nPlease note that the\n\\\n\\\nIf the redstone signal is turned off the vat will open again.\n",
-  "book.theurgy.the_hermetica.apparatus.fermentation_vat.redstone_control.title": "Redstone Control",
-  "book.theurgy.the_hermetica.apparatus.fermentation_vat.redstone_output.text": "The vat can be closed by applying a redstone signal (if a valid recipe is present).\\\nIf a redstone signal is applied and ingredients for a valid recipe are inserted, the vat will automatically close.\n\\\n\\\nIf the redstone signal is turned off the vat will open again.\n",
-  "book.theurgy.the_hermetica.apparatus.fermentation_vat.redstone_output.title": "Redstone Output",
   "book.theurgy.the_hermetica.apparatus.fermentation_vat.usage.text": "Place the vat on the ground.\\\nThen right-click it with the ingredients (usually an Alchemical Sulfur and a source of sugar, such as a crop)\\\nRight-click the block with a water bucket (or supply via pipes)\\\nShift-right-click the vat with an empty hand to close it.\n",
   "book.theurgy.the_hermetica.apparatus.fermentation_vat.usage.title": "Usage",
   "book.theurgy.the_hermetica.apparatus.fermentation_vat.usage2.text": "Both items and fluids can also be piped in and out of the vat, or hoppers can be used.\n",

diff --git a/...sources/data/theurgy/modonomicon/books/the_hermetica/entries/apparatus/digestion_vat.json b/...sources/data/theurgy/modonomicon/books/the_hermetica/entries/apparatus/digestion_vat.json
@@ -64,17 +64,6 @@
       "text": "book.theurgy.the_hermetica.apparatus.digestion_vat.usage2.text",
       "title": "book.theurgy.the_hermetica.apparatus.digestion_vat.usage2.title",
       "use_markdown_in_title": false
-    },
-    {
-      "type": "modonomicon:text",
-      "anchor": "",
-      "condition": {
-        "type": "modonomicon:none"
-      },
-      "show_title_separator": true,
-      "text": "book.theurgy.the_hermetica.apparatus.digestion_vat.redstone.text",
-      "title": "book.theurgy.the_hermetica.apparatus.digestion_vat.redstone.title",
-      "use_markdown_in_title": false
     }
   ],
   "parents": [

diff --git a/...rces/data/theurgy/modonomicon/books/the_hermetica/entries/apparatus/fermentation_vat.json b/...rces/data/theurgy/modonomicon/books/the_hermetica/entries/apparatus/fermentation_vat.json
@@ -75,28 +75,6 @@
       "text": "book.theurgy.the_hermetica.apparatus.fermentation_vat.usage2.text",
       "title": "book.theurgy.the_hermetica.apparatus.fermentation_vat.usage2.title",
       "use_markdown_in_title": false
-    },
-    {
-      "type": "modonomicon:text",
-      "anchor": "",
-      "condition": {
-        "type": "modonomicon:none"
-      },
-      "show_title_separator": true,
-      "text": "book.theurgy.the_hermetica.apparatus.fermentation_vat.redstone_control.text",
-      "title": "book.theurgy.the_hermetica.apparatus.fermentation_vat.redstone_control.title",
-      "use_markdown_in_title": false
-    },
-    {
-      "type": "modonomicon:text",
-      "anchor": "",
-      "condition": {
-        "type": "modonomicon:none"
-      },
-      "show_title_separator": true,
-      "text": "book.theurgy.the_hermetica.apparatus.fermentation_vat.redstone_output.text",
-      "title": "book.theurgy.the_hermetica.apparatus.fermentation_vat.redstone_output.title",
-      "use_markdown_in_title": false
     }
   ],
   "parents": [

diff --git a/...ikli_dev/theurgy/datagen/book/apparatus/transmutationandexaltation/DigestionVatEntry.java b/...ikli_dev/theurgy/datagen/book/apparatus/transmutationandexaltation/DigestionVatEntry.java
@@ -77,21 +77,6 @@ protected void generatePages() {
                         Both items and fluids can also be piped in and out of the vat, or hoppers can be used.
                         """
         );
-
-        this.page("redstone", () -> BookTextPageModel.create()
-                .withTitle(this.context().pageTitle())
-                .withText(this.context().pageText()));
-        this.add(this.context().pageTitle(), "Redstone");
-        this.add(this.context().pageText(),
-                """
-                        The vat can be closed by applying a redstone signal (if a valid recipe is present).\\
-                        If a redstone signal is applied and ingredients for a valid recipe are inserted, the vat will automatically close.
-                        \\
-                        \\
-                        If the redstone signal is turned off the vat will open again.
-                        """
-        );
-
     }
 
     @Override

diff --git a/...i_dev/theurgy/datagen/book/apparatus/transmutationandexaltation/FermentationVatEntry.java b/...i_dev/theurgy/datagen/book/apparatus/transmutationandexaltation/FermentationVatEntry.java
@@ -84,36 +84,6 @@ protected void generatePages() {
                         Both items and fluids can also be piped in and out of the vat, or hoppers can be used.
                         """
         );
-
-        this.page("redstone_control", () -> BookTextPageModel.create()
-                .withTitle(this.context().pageTitle())
-                .withText(this.context().pageText()));
-        this.add(this.context().pageTitle(), "Redstone Control");
-        this.add(this.context().pageText(),
-                """
-                        The vat can be closed by applying a redstone signal (if a valid recipe is present).\\
-                        If a redstone signal is applied and ingredients for a valid recipe are inserted, the vat will automatically close.\\
-                        Please note that the 
-                        \\
-                        \\
-                        If the redstone signal is turned off the vat will open again.
-                        """
-        );
-
-        this.page("redstone_output", () -> BookTextPageModel.create()
-                .withTitle(this.context().pageTitle())
-                .withText(this.context().pageText()));
-        this.add(this.context().pageTitle(), "Redstone Output");
-        this.add(this.context().pageText(),
-                """
-                        The vat can be closed by applying a redstone signal (if a valid recipe is present).\\
-                        If a redstone signal is applied and ingredients for a valid recipe are inserted, the vat will automatically close.
-                        \\
-                        \\
-                        If the redstone signal is turned off the vat will open again.
-                        """
-        );
-
     }
 
     @Override