Merge pull request #43 from GrowthcraftCE/development

Release for Growthcraft 9.1.0.rc3
GrowthcraftCE · Oct 16, 2023 · 83b55ea · 83b55ea
2 parents f602dd4 + 44dc34a
commit 83b55ea
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 25 deletions.
diff --git a/src/main/java/growthcraft/milk/datagen/DataGeneration.java b/src/main/java/growthcraft/milk/datagen/DataGeneration.java
@@ -2,18 +2,15 @@
 
 import growthcraft.milk.datagen.loot.GrowthcraftMilkLootTables;
 import growthcraft.milk.init.GrowthcraftMilkItems;
-import growthcraft.milk.shared.Reference;
 import net.minecraft.data.DataGenerator;
 import net.minecraft.data.PackOutput;
 import net.minecraftforge.client.event.ModelEvent;
 import net.minecraftforge.common.data.ExistingFileHelper;
 import net.minecraftforge.data.event.GatherDataEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod;
 
-@Mod.EventBusSubscriber(modid = Reference.MODID, bus = Mod.EventBusSubscriber.Bus.MOD)
+//@Mod.EventBusSubscriber(modid = Reference.MODID, bus = Mod.EventBusSubscriber.Bus.MOD)
 public class DataGeneration {
-    @SubscribeEvent
+    //@SubscribeEvent
     public static void generate(GatherDataEvent event) {
         DataGenerator generator = event.getGenerator();
         PackOutput output = generator.getPackOutput();
@@ -29,7 +26,7 @@ public static void generate(GatherDataEvent event) {
 
     }
 
-    @SubscribeEvent
+    //@SubscribeEvent
     public static void modelBake(ModelEvent.ModifyBakingResult event) {
         GrowthcraftMilkItems.addItemModelProperties();
     }

diff --git a/...rces/assets/growthcraft/patchouli_books/growthcraft/en_us/entries/milk/making_cheese.json b/...rces/assets/growthcraft/patchouli_books/growthcraft/en_us/entries/milk/making_cheese.json
@@ -6,7 +6,12 @@
   "pages": [
     {
       "type": "patchouli:text",
-      "text": "The art of making cheese dates back over 7,000 years ago. This process has remained relatively the same over the ages.$(br2)1. Make cultured milk in the mixing vat$(br)2. Make cheese curds$(br)3. Drain the cheese curds$(br)4. Press the curds into a wheel"
+      "text": "The art of making cheese dates back over 7,000 years ago. This process has remained relatively the same over the ages."
+    },
+    {
+      "type": "patchouli:text",
+      "title": "Summary",
+      "text": "$(br)1. Make cultured milk in the mixing vat$(br2)2. Make cheese curds$(br2)3. Drain the cheese curds$(br2)4. Press the curds into a wheel$(br2)5. Age your cheese wheel"
     },
     {
       "type": "patchouli:text",
@@ -22,24 +27,6 @@
       ],
       "text": "Next, add ingredients to make cheese curds of your intended cheese."
     },
-    {
-      "type": "image",
-      "title": "Draining Curds",
-      "border": true,
-      "images": [
-        "growthcraft:textures/patchouli/screenshots/cheese/hanging_cheese_curds.png"
-      ],
-      "text": "Now that you have cheese curds, attach them to the underside of a block to drain."
-    },
-    {
-      "type": "image",
-      "title": "Cheese Press",
-      "border": true,
-      "images": [
-        "growthcraft:textures/patchouli/blocks/cheese_press_hanging_curds.png"
-      ],
-      "text": "Finally, you will need to place the drained curds into a $(l:milk/mixing_vat)Cheese Press$(/l)."
-    },
     {
       "type": "patchouli:crafting",
       "recipe": "growthcraft_milk:mixing_vat"
@@ -59,10 +46,33 @@
       "type": "text",
       "text": "Monterey Cheese$(li)1 Salt$(li)1 Red Dye$(br2)Provolone Cheese$(li)1 Salt$(li)1 Yellow Dye$(br2)Gouda Cheese$(li)1 Salt$(li)1 Gray Dye"
     },
+    {
+      "type": "image",
+      "title": "Draining Curds",
+      "border": true,
+      "images": [
+        "growthcraft:textures/patchouli/screenshots/cheese/hanging_cheese_curds.png"
+      ],
+      "text": "Now that you have cheese curds, attach them to the underside of a block to drain."
+    },
+    {
+      "type": "image",
+      "title": "Cheese Press",
+      "border": true,
+      "images": [
+        "growthcraft:textures/patchouli/blocks/cheese_press_hanging_curds.png"
+      ],
+      "text": "Finally, you will need to place the drained curds into a $(l:milk/mixing_vat)Cheese Press$(/l)."
+    },
     {
       "title": "Ingredients",
       "type": "text",
       "text": "Casu Marzu Cheese$(li)1 Salt$(li)1 Rotten Flesh"
+    },
+    {
+      "type": "patchouli:text",
+      "title": "Cheese Aging",
+      "text": "In order to make cheese editable, you will need to age your cheese. This is done by simply placing your cheese wheel down and waiting for it to age.$(br2)Once the cheese wheel has become aged, it will change colors."
     }
   ]
 }