Skip to content

Commit

Permalink
more modonomicon datagen
Browse files Browse the repository at this point in the history
  • Loading branch information
Thepigcat76 committed Sep 29, 2024
1 parent 19b235c commit 38ff5f5
Show file tree
Hide file tree
Showing 14 changed files with 158 additions and 23 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
// 1.21.1 2024-09-29T17:36:09.149322632 Multiblocks: nautec
3738df99167bd9a5db3a1e4f92c3e91e994fa2c1 data/nautec/modonomicon/multiblocks/drain.json
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.21.1 2024-09-29T15:46:30.478711514 Languages: en_us
a86b31e1e4713b4d53a3affa72470d3892f256ba assets/nautec/lang/en_us.json
// 1.21.1 2024-09-29T17:36:09.153307029 Languages: en_us
9e68096f6aa3e605b3141a4f2b887efa5ae6b3f2 assets/nautec/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2024-09-29T15:50:29.754618015 Books: nautec
// 1.21.1 2024-09-29T17:36:09.151278093 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
Expand All @@ -17,11 +17,11 @@ c29d0c9790eaf1ab263e474b0a31298eb1f7211b data/nautec/modonomicon/books/nautec_gu
009181d810690a18ad59f5fa8d5b2e73e0a21c68 data/nautec/modonomicon/books/nautec_guide/entries/laser_augmentation/laser_augmentation_introduction.json
07780c7ee007a420a044d5e382f37291dfa3e4b4 data/nautec/modonomicon/books/nautec_guide/entries/laser_augmentation/long_distance_laser.json
c03c7b650f9ea70b95dcb4465e44d1abaa28d838 data/nautec/modonomicon/books/nautec_guide/entries/laser_augmentation/mob_augments.json
531bb6789f8f941f0e6ba585d0383b9c440105bc data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/charger.json
f73cdc2c1f05a1e877cfa8ce982bcd0ff5bf94fb data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/chemistry_introduction.json
d70be2eaf9729ca163499da6d7a33730cf7e07f2 data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/charger.json
86bf0538af8e99ca0d8477c0c301c0a7938dea44 data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/chemistry_introduction.json
d8ccf0bdb2ccc6ddc9bcac854c96f5555e1df640 data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/crystal_shards.json
5b6835fd9e5ac147325e9c28f05459f5620c8f9c data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/drain.json
34c421cb513a6d5ac4631180a2bbd14aa09d021a data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/drain.json
65716fa85df9020bd445a8da037a326dd41e4887 data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/laser_manipulation.json
0cf50c5fd68f67b000d5be4828c096618ef8d0c1 data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/mixer.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
3aac42d28a66d8153bcc92410d7b62075eb65147 data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/tools.json
d7962fa5a5a4e89ba57d4f4ec46d4f98787a6d33 data/nautec/modonomicon/books/nautec_guide/entries/laser_chemistry/tools.json
21 changes: 13 additions & 8 deletions src/generated/resources/assets/nautec/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,37 +93,41 @@
"book.nautec.nautec_guide.laser_augmentation.mob_augments.guardian_eye.title": "Guardian Eye",
"book.nautec.nautec_guide.laser_augmentation.mob_augments.name": "Mob Augments",
"book.nautec.nautec_guide.laser_augmentation.name": "Laser Augmentation",
"book.nautec.nautec_guide.laser_chemistry.charger.charger.text": "Charging...\n",
"book.nautec.nautec_guide.laser_chemistry.charger.charger.text": " The charger is a block that can be used to charge items with Aquatic Power.\n \\\n To use it, shoot it with a laser beam from an energy source. \n \\\n The charger will then charge the item in the slot above it.\n ",
"book.nautec.nautec_guide.laser_chemistry.charger.charger.title": "Charger",
"book.nautec.nautec_guide.laser_chemistry.charger.description": "Bzzzzzz",
"book.nautec.nautec_guide.laser_chemistry.charger.description": "Laser Charging ????",
"book.nautec.nautec_guide.laser_chemistry.charger.name": "Charger",
"book.nautec.nautec_guide.laser_chemistry.chemistry_introduction.chemistry.text": "Chemistry is a powerful concept that while mysterious is\nalso quite interesting. An observation i have made is that chemistry\nis heavily focused around the ocean and mainly uses plants\nor magical crystals as ingredients for substances.\n\\\n\\\nEven though all of this might sound foreign, you have already\ncome across a chemical substance, Etching Acid.\nWhile not typical in its structure, it is still considered a chemical fluid\ndue to its transforming abilities.\n",
"book.nautec.nautec_guide.laser_chemistry.chemistry_introduction.chemistry.title": "Introduction to chemistry",
"book.nautec.nautec_guide.laser_chemistry.chemistry_introduction.description": "It's not gregtech, I swear",
"book.nautec.nautec_guide.laser_chemistry.chemistry_introduction.eas.text": "Electrolyte Algae Serum (EAS) is on of the first chemicals\nyou will come across. It is known for\nits transforming abilities that can empower\nitems and entities.\n\\\nYou might have already discovered that it uses another liquid: Salt Water\n\\\nSalt water can be obtained by filling a bucket of water in an ocean biome which\nwill turn it into salt water. In the future there are even more powerful ways\nto gather it, so stay tuned!\n",
"book.nautec.nautec_guide.laser_chemistry.chemistry_introduction.eas.text": "Electrolyte Algae Serum (EAS) is one of the first chemicals\nyou will come across. It is known for\nits transforming abilities that can empower\nitems and entities.\n",
"book.nautec.nautec_guide.laser_chemistry.chemistry_introduction.eas.title": "Electrolyte Algae Serum",
"book.nautec.nautec_guide.laser_chemistry.chemistry_introduction.name": "Introduction to Chemistry",
"book.nautec.nautec_guide.laser_chemistry.chemistry_introduction.salt_water.text": "You might have already discovered that it uses another liquid: Salt Water\n\\\nSalt water can be obtained by filling a bucket of water in an ocean biome which\nwill turn it into salt water. In the future there are even more powerful ways\nto gather it, so stay tuned!\n",
"book.nautec.nautec_guide.laser_chemistry.chemistry_introduction.salt_water.title": "Salt Water",
"book.nautec.nautec_guide.laser_chemistry.crystal_shards.description": "Not an amethyst rextexture!",
"book.nautec.nautec_guide.laser_chemistry.crystal_shards.name": "Prismarine Crystal Shards",
"book.nautec.nautec_guide.laser_chemistry.crystal_shards.prismarine_crystal_shards.text": "Crystal shards are end of chapter :3\n",
"book.nautec.nautec_guide.laser_chemistry.crystal_shards.prismarine_crystal_shards.text": "Prismarine Crystal Shards are a pristine\nmaterial required for some of the most\nadvanced machinery.\n\\\n\\\nIn order to obtain them you have to\nuse the Aquarine Steel Pickaxe with\nits ability enabled. Make sure that\nit has more than 100 power as that is\nthe amount it uses to preserve the drops.\n",
"book.nautec.nautec_guide.laser_chemistry.crystal_shards.prismarine_crystal_shards.title": "Prismarine Crystal Shard",
"book.nautec.nautec_guide.laser_chemistry.drain.description": "Sucks in everything",
"book.nautec.nautec_guide.laser_chemistry.drain.drain.text": "Drain much salt wata...\n",
"book.nautec.nautec_guide.laser_chemistry.drain.drain.text": "The Deep Sea Drain is a mutliblock dedicated\nto draining huge amounts of salt water.\n\\\nIn order to do so, it must be constructed in an\nocean biome. After forming the multiblock, shift-right-click\non the center valve block to open it.\nAlso make sure to right-click one of the middle wall blocks\nwith a wrench to open a laser port and supply it with power.\n",
"book.nautec.nautec_guide.laser_chemistry.drain.drain.title": "Deep Sea Drain",
"book.nautec.nautec_guide.laser_chemistry.drain.drain_multi.text": "To form the deep sea drain, the player\nneeds to right-click the center block with\nan Aquarine Steel Wrench.\n\nBe Careful: The drain will suck in any entity! Even items\n",
"book.nautec.nautec_guide.laser_chemistry.drain.name": "Deep Sea Drain",
"book.nautec.nautec_guide.laser_chemistry.laser_manipulation.description": "Playing with Lasers !",
"book.nautec.nautec_guide.laser_chemistry.laser_manipulation.laser_manipulation.text": "The Prismarine Laser Relay is a block that allows you to extend the range of your lasers.\nMake sure to point the arrow to the right direction!\n\\\nIt is crafted using 6 Polish Prismarine blocks.\n\\\n\\\nThe Laser Junction is a block that allows you to split a laser beam into multiple directions.\nWhile the recipe is quite expensive, it is a very useful block to have.\n",
"book.nautec.nautec_guide.laser_chemistry.laser_manipulation.laser_manipulation.title": "Laser Manipulation",
"book.nautec.nautec_guide.laser_chemistry.laser_manipulation.name": "Laser Manipulation",
"book.nautec.nautec_guide.laser_chemistry.mixer.description": "Mixing my way through the ocean",
"book.nautec.nautec_guide.laser_chemistry.mixer.mixer.text": "The Mixer is a powerful machine that can mix and combine items in a variety of ways.\n\\\nIt requires laser power to operate. To display informations about the ongoing process, you can use the Monocle.\n\\\nIts main purpose is to craft the Electrolyte Algae Serum, used to infuse tools to unlock their full potential.\n",
"book.nautec.nautec_guide.laser_chemistry.mixer.mixer.text": "The Mixer is a powerful machine that can mix and combine items in a variety of ways.\n\\\nIt requires laser power to operate. To display informations about the ongoing process, you can use the Monocle.\n",
"book.nautec.nautec_guide.laser_chemistry.mixer.mixer_recipe.text": "Its main purpose is to mix ingredients into chemicals like EAS or Etching Acid, used to infuse tools to unlock their full potential.\n",
"book.nautec.nautec_guide.laser_chemistry.mixer.name": "The Mixer",
"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.title": "Prismatic Battery",
"book.nautec.nautec_guide.laser_chemistry.tools.basic_tools.text": "Tools...\n",
"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",
"book.nautec.nautec_guide.laser_chemistry.tools.description": "Innocent looking",
"book.nautec.nautec_guide.laser_chemistry.tools.name": "Aquarine Steel Tools",
Expand Down Expand Up @@ -186,5 +190,6 @@
"multiblock.info.block_pos": "Coordinates: %d, %d, %d",
"multiblock.info.expected_block": "Expected: %s",
"multiblock.info.failed_to_construct": "Missing or invalid block",
"nautec.creative_tab.main": "NauTec"
"nautec.creative_tab.main": "NauTec",
"nautec_guide.desc.0": "Nautec's Guide"
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,22 @@
"type": "modonomicon:none"
},
"item": {
"item": "nautec:salt_water_bucket"
"item": "nautec:eas_bucket"
},
"text": "book.nautec.nautec_guide.laser_chemistry.chemistry_introduction.eas.text",
"title": "book.nautec.nautec_guide.laser_chemistry.chemistry_introduction.eas.title"
},
{
"type": "modonomicon:spotlight",
"anchor": "",
"condition": {
"type": "modonomicon:none"
},
"item": {
"item": "nautec:salt_water_bucket"
},
"text": "book.nautec.nautec_guide.laser_chemistry.chemistry_introduction.salt_water.text",
"title": "book.nautec.nautec_guide.laser_chemistry.chemistry_introduction.salt_water.title"
}
],
"parents": [
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.drain.drain.text",
"title": "book.nautec.nautec_guide.laser_chemistry.drain.drain.title",
"use_markdown_in_title": false
},
{
"type": "modonomicon:multiblock",
"anchor": "",
"condition": {
"type": "modonomicon:none"
},
"multiblock_id": "drain",
"multiblock_name": "",
"show_visualize_button": true,
"text": "book.nautec.nautec_guide.laser_chemistry.drain.drain_multi.text"
}
],
"parents": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"type": "modonomicon:none"
},
"recipe_id_1": "nautec:mixer",
"text": "",
"text": "book.nautec.nautec_guide.laser_chemistry.mixer.mixer_recipe.text",
"title1": "Mixer Recipe",
"title2": ""
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"type": "modonomicon:dense",
"mapping": {
"*": {
"type": "modonomicon:display",
"display": "minecraft:basalt"
},
"+": {
"type": "modonomicon:display",
"display": "minecraft:stone"
},
"0": {
"type": "modonomicon:block",
"block": "nautec:deep_sea_drain"
},
"W": {
"type": "modonomicon:block",
"block": "nautec:deep_sea_drain_wall"
}
},
"pattern": [
[
"_____",
"_WWW_",
"_W0W_",
"_WWW_",
"_____"
],
[
"*+*+*",
"+*+*+",
"*+*+*",
"+*+*+",
"*+*+*"
]
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.klikli_dev.modonomicon.api.datagen.LanguageProviderCache;
import com.klikli_dev.modonomicon.api.datagen.NeoBookProvider;
import com.portingdeadmods.nautec.compat.modonomicon.datagen.book.NautecGuide;
import com.portingdeadmods.nautec.compat.modonomicon.datagen.book.NautecGuideMultiblockProvider;
import com.portingdeadmods.nautec.datagen.EnUsProvider;
import net.minecraft.data.DataGenerator;
import net.neoforged.neoforge.data.event.GatherDataEvent;
Expand All @@ -13,5 +14,6 @@ public static void register(GatherDataEvent event) {
LanguageProviderCache enUsCache = new LanguageProviderCache("en_us");
generator.addProvider(event.includeServer(), NeoBookProvider.of(event, new NautecGuide(enUsCache)));
generator.addProvider(event.includeClient(), new EnUsProvider(generator.getPackOutput(), enUsCache));
generator.addProvider(event.includeServer(), new NautecGuideMultiblockProvider(generator.getPackOutput()));
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package com.portingdeadmods.nautec.compat.modonomicon.datagen.book;

import com.klikli_dev.modonomicon.api.datagen.MultiblockProvider;
import com.portingdeadmods.nautec.Nautec;
import com.portingdeadmods.nautec.registries.NTBlocks;
import net.minecraft.data.PackOutput;

public class NautecGuideMultiblockProvider extends MultiblockProvider {
public NautecGuideMultiblockProvider(PackOutput packOutput) {
super(packOutput, Nautec.MODID);
}

@Override
public void buildMultiblocks() {
this.add(modLoc("drain"), new MultiblockProvider.DenseMultiblockBuilder()
.layer(
"WWW",
"W0W",
"WWW"
)
.block('W', NTBlocks.DRAIN_WALL)
.block('0', NTBlocks.DRAIN).build(false));
}
}
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.BookTextPageModel;
import com.mojang.datafixers.util.Pair;
import com.portingdeadmods.nautec.registries.NTItems;

Expand All @@ -14,7 +15,13 @@ public LaserAugmentationIntroductionEntry(CategoryProviderBase parent) {

@Override
protected void generatePages() {

this.page("long_distance_laser", () -> BookTextPageModel.create()
.withTitle(this.context().pageTitle())
.withText(this.context().pageText()));
this.pageTitle("Long Distance Laser");
this.pageText("""
shoot lasers up to 64 blocks, might be bad for fps
""");
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ Electrolyte Algae Serum (EAS) is one of the first chemicals
items and entities.
""");

this.page("eas", () -> BookSpotlightPageModel.create()
this.page("salt_water", () -> BookSpotlightPageModel.create()
.withTitle(this.context().pageTitle())
.withItem(NTItems.SALT_WATER_BUCKET.get())
.withText(this.context().pageText()));
this.pageTitle("Electrolyte Algae Serum");
this.pageTitle("Salt Water");
this.pageText("""
You might have already discovered that it uses another liquid: Salt Water
\\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@
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.BookSpotlightPageModel;
import com.klikli_dev.modonomicon.api.datagen.book.page.BookTextPageModel;
import com.mojang.datafixers.util.Pair;
import com.portingdeadmods.nautec.registries.NTBlocks;
import com.portingdeadmods.nautec.registries.NTItems;

public class CrystalShardsEntry extends EntryProvider {
Expand All @@ -22,8 +24,21 @@ protected void generatePages() {
this.pageText("""
Prismarine Crystal Shards are a pristine
material required for some of the most
advanced machinery
advanced machinery.
\\
\\
In order to obtain them you have to
use the Aquarine Steel Pickaxe with
its ability enabled and mine a Prismarine crystal.
\\
Make sure that it has more than 100 power as that is
the amount it needs to preserve the drops.
""");

this.page("shard_and_crystal", () -> BookSpotlightPageModel.create()
.withTitle("Crystal & Shard")
.withItem(NTBlocks.PRISMARINE_CRYSTAL)
.withItem(NTItems.PRISMARINE_CRYSTAL_SHARD));
}

@Override
Expand Down
Loading

0 comments on commit 38ff5f5

Please sign in to comment.