Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8
#	src/generated/resources/.cache/eb748cc26e43de416ad491bd48ccca24d169a651
  • Loading branch information
Thepigcat76 committed Sep 29, 2024
2 parents 1cdaaea + bc00582 commit ae1af38
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/generated/resources/assets/nautec/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
"book.nautec.nautec_guide.laser_chemistry.name": "Laser Chemistry",
"book.nautec.nautec_guide.laser_chemistry.prismatic_battery.description": "Charger²",
"book.nautec.nautec_guide.laser_chemistry.prismatic_battery.name": "Prismatic Battery",
"book.nautec.nautec_guide.laser_chemistry.prismatic_battery.prismatic_battery.text": "Curios slot, charges inventory\n",
"book.nautec.nautec_guide.laser_chemistry.prismatic_battery.prismatic_battery.text": "The Prismatic Battery is a powerful energy storage device that can store up to 10,000 AP\n\\\nIt is mainly used to charge tools and armor in your inventory.\n\\\nShift-right-clicking with the battery in your hand will enable it.\n\\\nWhen enabled, the battery will charge any item in your inventory that can be charged.\n\\\n(Note: It has to be in it's curios slot to function)\n",
"book.nautec.nautec_guide.laser_chemistry.prismatic_battery.prismatic_battery.title": "Prismatic Battery",
"book.nautec.nautec_guide.laser_chemistry.tools.basic_tools.text": "The Aquarine Steel Tools are quite special. They use Aquatic Power to function and are unbreakable.\n\\\nBy infusing them in EAS fluid, they can be upgraded to have special abilities.\n\\\nEach tool has a unique ability that is explained in the tooltips.\n\\\nShift-right-clicking with the tool in hand will activate the ability.\n",
"book.nautec.nautec_guide.laser_chemistry.tools.basic_tools.title": "Aquarine Steel Tools",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,17 @@
"text": "book.nautec.nautec_guide.laser_chemistry.prismatic_battery.prismatic_battery.text",
"title": "book.nautec.nautec_guide.laser_chemistry.prismatic_battery.prismatic_battery.title",
"use_markdown_in_title": false
},
{
"type": "modonomicon:crafting_recipe",
"anchor": "",
"condition": {
"type": "modonomicon:none"
},
"recipe_id_1": "nautec:prismatic_battery",
"text": "",
"title1": "Prismatic Battery Recipe",
"title2": ""
}
],
"parents": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.klikli_dev.modonomicon.api.datagen.EntryBackground;
import com.klikli_dev.modonomicon.api.datagen.EntryProvider;
import com.klikli_dev.modonomicon.api.datagen.book.BookIconModel;
import com.klikli_dev.modonomicon.api.datagen.book.page.BookCraftingRecipePageModel;
import com.klikli_dev.modonomicon.api.datagen.book.page.BookTextPageModel;
import com.mojang.datafixers.util.Pair;
import com.portingdeadmods.nautec.registries.NTItems;
Expand All @@ -20,8 +21,19 @@ protected void generatePages() {
.withText(this.context().pageText()));
this.pageTitle("Prismatic Battery");
this.pageText("""
Curios slot, charges inventory
The Prismatic Battery is a powerful energy storage device that can store up to 10,000 AP
\\
It is mainly used to charge tools and armor in your inventory.
\\
Shift-right-clicking with the battery in your hand will enable it.
\\
When enabled, the battery will charge any item in your inventory that can be charged.
\\
(Note: It has to be in it's curios slot to function)
""");
this.page("batter_recipe",() -> BookCraftingRecipePageModel.create()
.withTitle1("Prismatic Battery Recipe")
.withRecipeId1("nautec:prismatic_battery"));
}

@Override
Expand Down

0 comments on commit ae1af38

Please sign in to comment.