From 796b47ab34d0a0fb5f0ac3e8fd53ddff5c455fe8 Mon Sep 17 00:00:00 2001 From: Aly Date: Tue, 15 Dec 2020 17:55:13 -0800 Subject: [PATCH] Fix up the categories: Only need one book --- .../tf/bug/monadmachines/MonadMachines.kt | 3 +-- ...troToComputing.kt => MonadMachinesManual.kt} | 7 +++---- .../assets/monadmachines/lang/en_us.json | 4 ++-- .../{intro_to_computing.json => manual.json} | 2 +- .../item/{intro_to_computing.png => manual.png} | Bin .../intro_to_computing/book.json | 8 -------- .../patchouli_books/manual/book.json | 8 ++++++++ .../manual/en_us/categories/about.json | 6 ++++++ .../manual/en_us/categories/intro.json | 6 ++++++ .../en_us/entries/about/monadmachines.json | 16 ++++++++++++++++ .../en_us/entries/intro/first_computer.json | 16 ++++++++++++++++ 11 files changed, 59 insertions(+), 17 deletions(-) rename src/main/kotlin/tf/bug/monadmachines/{books/IntroToComputing.kt => MonadMachinesManual.kt} (88%) rename src/main/resources/assets/monadmachines/models/item/{intro_to_computing.json => manual.json} (50%) rename src/main/resources/assets/monadmachines/textures/item/{intro_to_computing.png => manual.png} (100%) delete mode 100644 src/main/resources/data/monadmachines/patchouli_books/intro_to_computing/book.json create mode 100644 src/main/resources/data/monadmachines/patchouli_books/manual/book.json create mode 100644 src/main/resources/data/monadmachines/patchouli_books/manual/en_us/categories/about.json create mode 100644 src/main/resources/data/monadmachines/patchouli_books/manual/en_us/categories/intro.json create mode 100644 src/main/resources/data/monadmachines/patchouli_books/manual/en_us/entries/about/monadmachines.json create mode 100644 src/main/resources/data/monadmachines/patchouli_books/manual/en_us/entries/intro/first_computer.json diff --git a/src/main/kotlin/tf/bug/monadmachines/MonadMachines.kt b/src/main/kotlin/tf/bug/monadmachines/MonadMachines.kt index a1bef1b..b937726 100644 --- a/src/main/kotlin/tf/bug/monadmachines/MonadMachines.kt +++ b/src/main/kotlin/tf/bug/monadmachines/MonadMachines.kt @@ -5,7 +5,6 @@ import net.minecraft.item.ItemGroup import net.minecraft.item.ItemStack import net.minecraft.util.Identifier import net.minecraft.util.registry.Registry -import tf.bug.monadmachines.books.IntroToComputing val MONADMACHINES_ITEMGROUP: ItemGroup = FabricItemGroupBuilder.build( Identifier("monadmachines", "group") @@ -13,7 +12,7 @@ val MONADMACHINES_ITEMGROUP: ItemGroup = FabricItemGroupBuilder.build( @Suppress("unused") fun init() { - Registry.register(Registry.ITEM, IntroToComputing.id, IntroToComputing) + Registry.register(Registry.ITEM, MonadMachinesManual.id, MonadMachinesManual) Registry.register(Registry.BLOCK, ProgramWorkstation.id, ProgramWorkstation) Registry.register(Registry.ITEM, ProgramWorkstation.id, ProgramWorkstation.item) diff --git a/src/main/kotlin/tf/bug/monadmachines/books/IntroToComputing.kt b/src/main/kotlin/tf/bug/monadmachines/MonadMachinesManual.kt similarity index 88% rename from src/main/kotlin/tf/bug/monadmachines/books/IntroToComputing.kt rename to src/main/kotlin/tf/bug/monadmachines/MonadMachinesManual.kt index 4e7cae9..b8cddef 100644 --- a/src/main/kotlin/tf/bug/monadmachines/books/IntroToComputing.kt +++ b/src/main/kotlin/tf/bug/monadmachines/MonadMachinesManual.kt @@ -1,4 +1,4 @@ -package tf.bug.monadmachines.books +package tf.bug.monadmachines import net.fabricmc.loader.api.FabricLoader import net.minecraft.client.item.TooltipContext @@ -11,12 +11,11 @@ import net.minecraft.text.TextColor import net.minecraft.text.TranslatableText import net.minecraft.util.* import net.minecraft.world.World -import tf.bug.monadmachines.MONADMACHINES_ITEMGROUP import vazkii.patchouli.api.PatchouliAPI -object IntroToComputing : Item(Settings().group(MONADMACHINES_ITEMGROUP)) { +object MonadMachinesManual : Item(Settings().group(MONADMACHINES_ITEMGROUP)) { - val id = Identifier("monadmachines", "intro_to_computing") + val id = Identifier("monadmachines", "manual") fun getEdition(): Text { return if(FabricLoader.getInstance().isModLoaded("patchouli")) { diff --git a/src/main/resources/assets/monadmachines/lang/en_us.json b/src/main/resources/assets/monadmachines/lang/en_us.json index 9b43668..5c2b43b 100644 --- a/src/main/resources/assets/monadmachines/lang/en_us.json +++ b/src/main/resources/assets/monadmachines/lang/en_us.json @@ -2,8 +2,8 @@ "monadmachines.no_patchouli_tooltip": "Patchouli not found!", "monadmachines.no_patchouli_message": "Patchouli was not detected to be loaded! Please install the mod, or check your logs for any errors that might cause it to not load.", - "item.monadmachines.intro_to_computing": "Intro to Computing", - "monadmachines.intro_to_computing.landing": "Getting Started with MonadMachines", + "item.monadmachines.manual": "Owner's Manual", + "monadmachines.manual.landing": "From your first computer to full automation", "itemGroup.monadmachines.group": "MonadMachines", diff --git a/src/main/resources/assets/monadmachines/models/item/intro_to_computing.json b/src/main/resources/assets/monadmachines/models/item/manual.json similarity index 50% rename from src/main/resources/assets/monadmachines/models/item/intro_to_computing.json rename to src/main/resources/assets/monadmachines/models/item/manual.json index 72afbb2..49ce3d6 100644 --- a/src/main/resources/assets/monadmachines/models/item/intro_to_computing.json +++ b/src/main/resources/assets/monadmachines/models/item/manual.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "monadmachines:item/intro_to_computing" + "layer0": "monadmachines:item/manual" } } diff --git a/src/main/resources/assets/monadmachines/textures/item/intro_to_computing.png b/src/main/resources/assets/monadmachines/textures/item/manual.png similarity index 100% rename from src/main/resources/assets/monadmachines/textures/item/intro_to_computing.png rename to src/main/resources/assets/monadmachines/textures/item/manual.png diff --git a/src/main/resources/data/monadmachines/patchouli_books/intro_to_computing/book.json b/src/main/resources/data/monadmachines/patchouli_books/intro_to_computing/book.json deleted file mode 100644 index f4bb9a5..0000000 --- a/src/main/resources/data/monadmachines/patchouli_books/intro_to_computing/book.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "item.monadmachines.intro_to_computing", - "landing_text": "monadmachines.intro_to_computing.landing", - "version": 1, - "dont_generate_book": true, - "custom_book_item": "monadmachines:intro_to_computing", - "creative_tab": "monadmachines.group" -} diff --git a/src/main/resources/data/monadmachines/patchouli_books/manual/book.json b/src/main/resources/data/monadmachines/patchouli_books/manual/book.json new file mode 100644 index 0000000..3e57dc0 --- /dev/null +++ b/src/main/resources/data/monadmachines/patchouli_books/manual/book.json @@ -0,0 +1,8 @@ +{ + "name": "item.monadmachines.manual", + "landing_text": "monadmachines.manual.landing", + "version": 1, + "dont_generate_book": true, + "custom_book_item": "monadmachines:manual", + "creative_tab": "monadmachines.group" +} diff --git a/src/main/resources/data/monadmachines/patchouli_books/manual/en_us/categories/about.json b/src/main/resources/data/monadmachines/patchouli_books/manual/en_us/categories/about.json new file mode 100644 index 0000000..c77aa84 --- /dev/null +++ b/src/main/resources/data/monadmachines/patchouli_books/manual/en_us/categories/about.json @@ -0,0 +1,6 @@ +{ + "name": "About MonadMachines", + "description": "What is MonadMachines? Do I need programming experience?", + "icon": "monadmachines:manual", + "sortnum": 0 +} diff --git a/src/main/resources/data/monadmachines/patchouli_books/manual/en_us/categories/intro.json b/src/main/resources/data/monadmachines/patchouli_books/manual/en_us/categories/intro.json new file mode 100644 index 0000000..3b146d3 --- /dev/null +++ b/src/main/resources/data/monadmachines/patchouli_books/manual/en_us/categories/intro.json @@ -0,0 +1,6 @@ +{ + "name": "Intro to Computing", + "description": "Build and program your first computer.", + "icon": "monadmachines:program_card", + "sortnum": 1 +} diff --git a/src/main/resources/data/monadmachines/patchouli_books/manual/en_us/entries/about/monadmachines.json b/src/main/resources/data/monadmachines/patchouli_books/manual/en_us/entries/about/monadmachines.json new file mode 100644 index 0000000..dc54be5 --- /dev/null +++ b/src/main/resources/data/monadmachines/patchouli_books/manual/en_us/entries/about/monadmachines.json @@ -0,0 +1,16 @@ +{ + "name": "What is MonadMachines?", + "icon": "monadmachines:manual", + "category": "monadmachines:about", + "pages": [ + { + "type": "text", + "text": "MonadMachines is a computing mod designed to be more powerful and less game-breaking than its predecessors. It requires more powerful items in the early-game and locks certain features away until late-game in hopes of preventing computers from being incredibly overpowered." + }, + { + "type": "text", + "title": "I can't program!", + "text": "My hope is that MonadMachines is usable by and approachable to anyone who doesn't have prior experience programming. It's my belief that a mod like this is a great way to teach certain programming constructs and ideas if done correctly.$(br2)That being said, there's a great chance there are concepts not explained well in the book.$(br)$(4)TODO:$() $(7)Make a Discord for this$()" + } + ] +} diff --git a/src/main/resources/data/monadmachines/patchouli_books/manual/en_us/entries/intro/first_computer.json b/src/main/resources/data/monadmachines/patchouli_books/manual/en_us/entries/intro/first_computer.json new file mode 100644 index 0000000..1a72477 --- /dev/null +++ b/src/main/resources/data/monadmachines/patchouli_books/manual/en_us/entries/intro/first_computer.json @@ -0,0 +1,16 @@ +{ + "name": "Your First Computer", + "icon": "monadmachines:manual", + "category": "monadmachines:intro", + "pages": [ + { + "type": "text", + "text": "To start writing programs for your first computer, you're going to need to craft a $(3)Program Card$() and a $(3)Program Workstation$()." + }, + { + "type": "crafting", + "recipe": "monadmachines:program_card", + "recipe2": "monadmachines:program_workstation" + } + ] +}