diff --git a/README.md b/README.md deleted file mode 100644 index 975294e..0000000 --- a/README.md +++ /dev/null @@ -1,13 +0,0 @@ -# MonadMachines - -A computer mod that aims to teach functional programming concepts through -a tutorial book and a simple visual interface. - -Recommended: -- Patchouli: The mod uses Patchouli for its documentation. **Don't leave - out Patchouli unless you know what you're doing.** - -Suggested: -- Mod Menu: Shows mod information. -- Polymorph: Adds a recipe conflict resolver. Certain crafting recipes in - MonadMachines may conflict with other mods. diff --git a/src/main/kotlin/tf/bug/monadmachines/MonadMachines.kt b/src/main/kotlin/tf/bug/monadmachines/MonadMachines.kt index b937726..a1bef1b 100644 --- a/src/main/kotlin/tf/bug/monadmachines/MonadMachines.kt +++ b/src/main/kotlin/tf/bug/monadmachines/MonadMachines.kt @@ -5,6 +5,7 @@ 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") @@ -12,7 +13,7 @@ val MONADMACHINES_ITEMGROUP: ItemGroup = FabricItemGroupBuilder.build( @Suppress("unused") fun init() { - Registry.register(Registry.ITEM, MonadMachinesManual.id, MonadMachinesManual) + Registry.register(Registry.ITEM, IntroToComputing.id, IntroToComputing) Registry.register(Registry.BLOCK, ProgramWorkstation.id, ProgramWorkstation) Registry.register(Registry.ITEM, ProgramWorkstation.id, ProgramWorkstation.item) diff --git a/src/main/kotlin/tf/bug/monadmachines/MonadMachinesManual.kt b/src/main/kotlin/tf/bug/monadmachines/books/IntroToComputing.kt similarity index 88% rename from src/main/kotlin/tf/bug/monadmachines/MonadMachinesManual.kt rename to src/main/kotlin/tf/bug/monadmachines/books/IntroToComputing.kt index b8cddef..4e7cae9 100644 --- a/src/main/kotlin/tf/bug/monadmachines/MonadMachinesManual.kt +++ b/src/main/kotlin/tf/bug/monadmachines/books/IntroToComputing.kt @@ -1,4 +1,4 @@ -package tf.bug.monadmachines +package tf.bug.monadmachines.books import net.fabricmc.loader.api.FabricLoader import net.minecraft.client.item.TooltipContext @@ -11,11 +11,12 @@ 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 MonadMachinesManual : Item(Settings().group(MONADMACHINES_ITEMGROUP)) { +object IntroToComputing : Item(Settings().group(MONADMACHINES_ITEMGROUP)) { - val id = Identifier("monadmachines", "manual") + val id = Identifier("monadmachines", "intro_to_computing") 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 5c2b43b..9b43668 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.manual": "Owner's Manual", - "monadmachines.manual.landing": "From your first computer to full automation", + "item.monadmachines.intro_to_computing": "Intro to Computing", + "monadmachines.intro_to_computing.landing": "Getting Started with MonadMachines", "itemGroup.monadmachines.group": "MonadMachines", diff --git a/src/main/resources/assets/monadmachines/models/item/manual.json b/src/main/resources/assets/monadmachines/models/item/intro_to_computing.json similarity index 50% rename from src/main/resources/assets/monadmachines/models/item/manual.json rename to src/main/resources/assets/monadmachines/models/item/intro_to_computing.json index 49ce3d6..72afbb2 100644 --- a/src/main/resources/assets/monadmachines/models/item/manual.json +++ b/src/main/resources/assets/monadmachines/models/item/intro_to_computing.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "monadmachines:item/manual" + "layer0": "monadmachines:item/intro_to_computing" } } diff --git a/src/main/resources/assets/monadmachines/textures/item/manual.png b/src/main/resources/assets/monadmachines/textures/item/intro_to_computing.png similarity index 100% rename from src/main/resources/assets/monadmachines/textures/item/manual.png rename to src/main/resources/assets/monadmachines/textures/item/intro_to_computing.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 new file mode 100644 index 0000000..f4bb9a5 --- /dev/null +++ b/src/main/resources/data/monadmachines/patchouli_books/intro_to_computing/book.json @@ -0,0 +1,8 @@ +{ + "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 deleted file mode 100644 index 3e57dc0..0000000 --- a/src/main/resources/data/monadmachines/patchouli_books/manual/book.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "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 deleted file mode 100644 index c77aa84..0000000 --- a/src/main/resources/data/monadmachines/patchouli_books/manual/en_us/categories/about.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index 3b146d3..0000000 --- a/src/main/resources/data/monadmachines/patchouli_books/manual/en_us/categories/intro.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index dc54be5..0000000 --- a/src/main/resources/data/monadmachines/patchouli_books/manual/en_us/entries/about/monadmachines.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "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 deleted file mode 100644 index 1a72477..0000000 --- a/src/main/resources/data/monadmachines/patchouli_books/manual/en_us/entries/intro/first_computer.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "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" - } - ] -}