Re-enable patchouli and re-run datagen

common/build.gradle

@@ -13,8 +13,7 @@ dependencies {
     // Remove the next line if you don't want to depend on the API
     modApi "dev.architectury:architectury:${rootProject.architectury_version}"
 
-//    modImplementation("vazkii.patchouli:Patchouli-xplat:${patchouli_version}-SNAPSHOT")
-//    modImplementation("xyz.brassgoggledcoders:PatchouliProvider:${patchouli_provider_version}")
+//    modImplementation("vazkii.patchouli:Patchouli-xplat:${patchouli_version}")
 }
 
 publishing {

common/src/main/resources/chococraft/blockstates/gysahl_green.json

@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "age=0": {
+      "model": "chococraft:block/gysahl_green_stage0"
+    },
+    "age=1": {
+      "model": "chococraft:block/gysahl_green_stage1"
+    },
+    "age=2": {
+      "model": "chococraft:block/gysahl_green_stage2"
+    },
+    "age=3": {
+      "model": "chococraft:block/gysahl_green_stage3"
+    },
+    "age=4": {
+      "model": "chococraft:block/gysahl_green_stage4"
+    }
+  }
+}

common/src/main/resources/chococraft/blockstates/straw.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "chococraft:block/straw"
+    }
+  }
+}

common/src/main/resources/chococraft/models/block/gysahl_green_stage0.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cross",
+  "render_type": "minecraft:cutout",
+  "textures": {
+    "cross": "chococraft:block/gysahl_green0"
+  }
+}

common/src/main/resources/chococraft/models/block/gysahl_green_stage1.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cross",
+  "render_type": "minecraft:cutout",
+  "textures": {
+    "cross": "chococraft:block/gysahl_green1"
+  }
+}

common/src/main/resources/chococraft/models/block/gysahl_green_stage2.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cross",
+  "render_type": "minecraft:cutout",
+  "textures": {
+    "cross": "chococraft:block/gysahl_green2"
+  }
+}

common/src/main/resources/chococraft/models/block/gysahl_green_stage3.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cross",
+  "render_type": "minecraft:cutout",
+  "textures": {
+    "cross": "chococraft:block/gysahl_green3"
+  }
+}

common/src/main/resources/chococraft/models/block/gysahl_green_stage4.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cross",
+  "render_type": "minecraft:cutout",
+  "textures": {
+    "cross": "chococraft:block/gysahl_green4"
+  }
+}

common/src/main/resources/chococraft/models/block/straw.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/carpet",
+  "textures": {
+    "wool": "chococraft:block/straw"
+  }
+}

common/src/main/resources/chococraft/sounds.json

@@ -0,0 +1,26 @@
+{
+  "entity.chocobo.kweh": {
+    "sounds": [
+      "chococraft:entity/chocobo/kweh"
+    ],
+    "subtitle": "chococraft.subtitle.entity.chocobo.kweh"
+  },
+  "entity.chocobo.kwehwhistlefollow": {
+    "sounds": [
+      "chococraft:entity/chocobo/kwehwhistlefollow"
+    ],
+    "subtitle": "chococraft.subtitle.entity.chocobo.kwehwhistlefollow"
+  },
+  "entity.chocobo.kwehwhistlestay": {
+    "sounds": [
+      "chococraft:entity/chocobo/kwehwhistlestay"
+    ],
+    "subtitle": "chococraft.subtitle.entity.chocobo.kwehwhistlestay"
+  },
+  "entity.chocobo.kwehwhistlewander": {
+    "sounds": [
+      "chococraft:entity/chocobo/kwehwhistlewander"
+    ],
+    "subtitle": "chococraft.subtitle.entity.chocobo.kwehwhistlewander"
+  }
+}

common/src/main/resources/data/chococraft/patchouli_books/chocopedia/book.json

@@ -0,0 +1,18 @@
+{
+  "book_texture": "chococraft:textures/gui/patchouli_book.png",
+  "creative_tab": "chococraft",
+  "custom_book_item": "chococraft:chocopedia",
+  "dont_generate_book": true,
+  "filler_texture": "chococraft:textures/gui/chocobo_page_filler.png",
+  "i18n": true,
+  "landing_text": "info.chococraft.book.landing",
+  "macros": {
+    "$(item)": "$(#c47567)"
+  },
+  "model": "chococraft:chocopedia",
+  "name": "info.chocopedia.book.name",
+  "show_progress": false,
+  "subtitle": "info.chococraft.book.subtitle",
+  "use_blocky_font": true,
+  "use_resource_pack": true
+}

fabric/build.gradle

@@ -40,8 +40,7 @@ dependencies {
 
     modRuntimeOnly("mezz.jei:jei-${minecraft_version}-fabric:${jei_version}")
 
-//    modImplementation("vazkii.patchouli:Patchouli:${patchouli_version}-FABRIC-SNAPSHOT")
-//    modImplementation("xyz.brassgoggledcoders:PatchouliProvider:${patchouli_provider_version}")
+//    modImplementation("vazkii.patchouli:Patchouli:${patchouli_version}-FABRIC")
 }
 
 processResources {

gradle.properties

@@ -1,6 +1,6 @@
 org.gradle.jvmargs=-Xmx2G
 
-minecraft_version=1.21
+minecraft_version=1.21.1
 enabled_platforms=fabric,neoforge
 
 archives_base_name=chococraft
@@ -9,17 +9,17 @@ maven_group=net.chococraft
 
 architectury_version=13.0.6
 
-fabric_loader_version=0.15.11
-fabric_api_version=0.102.0+1.21
-cloth_config_version=15.0.128
-mod_menu_version=11.0.1
+fabric_loader_version=0.16.3
+fabric_api_version=0.103.0+1.21.1
+cloth_config_version=15.0.130
+mod_menu_version=11.0.2
 
 #Publishing
 curseforge_id=225280
 modrinth_id=bPTEaC7v
 
-neoforge_version=21.0.167
+neoforge_version=21.1.37
 
-jei_version=19.8.0.97
-patchouli_version=1.20.4-85
-patchouli_provider_version=1.20.4-1.0.10-Snapshot.6
+jei_version=19.16.4.165
+patchouli_version=1.21-87-NEOFORGE
+patchouli_provider_version=1.21.1-1.0.11-Snapshot.3

neoforge/build.gradle

@@ -59,8 +59,9 @@ dependencies {
 
     modRuntimeOnly("mezz.jei:jei-${minecraft_version}-neoforge:${jei_version}")
 
-//    modImplementation("vazkii.patchouli:Patchouli:${patchouli_version}-NEOFORGE-SNAPSHOT")
-//    modImplementation("xyz.brassgoggledcoders:PatchouliProvider:${patchouli_provider_version}")
+    modImplementation "vazkii.patchouli:Patchouli:${patchouli_version}"
+
+    modImplementation "xyz.brassgoggledcoders:PatchouliProvider:${patchouli_provider_version}"
 }
 
 processResources {

neoforge/src/main/java/net/chococraft/neoforge/datagen/ModDatagenerator.java

@@ -8,6 +8,7 @@
 import net.chococraft.neoforge.datagen.client.ChocoItemModels;
 import net.chococraft.neoforge.datagen.client.ChocoLanguage;
 import net.chococraft.neoforge.datagen.client.ChocoSoundProvider;
+import net.chococraft.neoforge.datagen.client.patchouli.PatchouliProvider;
 import net.chococraft.neoforge.datagen.data.ChocoLoot;
 import net.chococraft.neoforge.datagen.data.ChocoRecipes;
 import net.minecraft.core.Cloner;
@@ -53,7 +54,7 @@ public static void gatherData(GatherDataEvent event) {
 			generator.addProvider(event.includeServer(), new ChocoLoot(packOutput, lookupProvider));
 			generator.addProvider(event.includeServer(), new ChocoRecipes(packOutput, lookupProvider));
 
-//			generator.addProvider(event.includeServer(), new PatchouliProvider(packOutput));
+			generator.addProvider(event.includeServer(), new PatchouliProvider(packOutput, lookupProvider));
 
 			generator.addProvider(event.includeServer(), new DatapackBuiltinEntriesProvider(
 					packOutput, CompletableFuture.supplyAsync(ModDatagenerator::getProvider), Set.of(Chococraft.MOD_ID)));