From 677961048d3f6cc74088e24725cba723c074c308 Mon Sep 17 00:00:00 2001
From: thedarkcolour <30441001+thedarkcolour@users.noreply.github.com>
Date: Sun, 21 Jan 2024 12:38:05 -0800
Subject: [PATCH] Fix slime block crafting recipe

---
 .../.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e        | 3 ++-
 .../exdeorum/recipes/barrel_fluid_mixing/slime_block.json  | 7 +++++++
 src/main/java/thedarkcolour/exdeorum/ExDeorum.java         | 7 +++++++
 .../java/thedarkcolour/exdeorum/data/recipe/Recipes.java   | 2 ++
 4 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 src/generated/resources/data/exdeorum/recipes/barrel_fluid_mixing/slime_block.json

diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
index 714ab6f2..c3f2f595 100644
--- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
+++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
@@ -1,4 +1,4 @@
-// 1.20.1	2024-01-11T17:10:41.051025	Recipes
+// 1.20.1	2024-01-20T15:20:37.3902252	Recipes
 e37b64428f17e304e91539ac0513456d7ce40cd1 data/exdeorum/advancements/recipes/building_blocks/sponge.json
 5ad481a0c376c1a1785a5d3b992064d0ec0bf3b0 data/exdeorum/advancements/recipes/food/end_cake.json
 25dd027e844a72b03c95dbe5e3c3dd8c738ceb00 data/exdeorum/advancements/recipes/misc/acacia_barrel.json
@@ -167,6 +167,7 @@ b9a34df74ce0ee9c4247a9a64784c851eb1de58c data/exdeorum/recipes/barrel_compost/wo
 d08b7a270dff3f7bb45338798227a69d775e7c32 data/exdeorum/recipes/barrel_fluid_mixing/blackstone.json
 1a87de0d21b9677fda38f7a520cbffbdc41d8532 data/exdeorum/recipes/barrel_fluid_mixing/netherrack.json
 8b42ca284eaea721e8e7589e5fb0b16ccbe66ee5 data/exdeorum/recipes/barrel_fluid_mixing/obsidian.json
+fe744cd05e5e9f62aa8d51f5c89376374288c90f data/exdeorum/recipes/barrel_fluid_mixing/slime_block.json
 7cfc5db0d6fbb804a7bd1d3bbbbace986d90f3c4 data/exdeorum/recipes/barrel_fluid_mixing/stone.json
 bdcdeae9d06028ce943d06c367b58677efe03fa8 data/exdeorum/recipes/barrel_mixing/clay.json
 72f969f4db1f82a627df573c866a1b291e540a0a data/exdeorum/recipes/barrel_mixing/end_stone.json
diff --git a/src/generated/resources/data/exdeorum/recipes/barrel_fluid_mixing/slime_block.json b/src/generated/resources/data/exdeorum/recipes/barrel_fluid_mixing/slime_block.json
new file mode 100644
index 00000000..2cb51306
--- /dev/null
+++ b/src/generated/resources/data/exdeorum/recipes/barrel_fluid_mixing/slime_block.json
@@ -0,0 +1,7 @@
+{
+  "type": "exdeorum:barrel_fluid_mixing",
+  "additive_fluid": "minecraft:milk",
+  "base_fluid": "minecraft:water",
+  "base_fluid_amount": 1000,
+  "result": "minecraft:slime_block"
+}
\ No newline at end of file
diff --git a/src/main/java/thedarkcolour/exdeorum/ExDeorum.java b/src/main/java/thedarkcolour/exdeorum/ExDeorum.java
index 67f71914..9f3dfc7f 100644
--- a/src/main/java/thedarkcolour/exdeorum/ExDeorum.java
+++ b/src/main/java/thedarkcolour/exdeorum/ExDeorum.java
@@ -19,6 +19,8 @@
 package thedarkcolour.exdeorum;
 
 import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.common.ForgeMod;
+import net.minecraftforge.data.loading.DatagenModLoader;
 import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.ModLoadingContext;
@@ -56,6 +58,11 @@ public class ExDeorum {
         createRegistries();
         NetworkHandler.register();
 
+        // Still enabled in Dev environment because KubeJS enables milk fluid
+        if (DatagenModLoader.isRunningDataGen()) {
+            ForgeMod.enableMilkFluid();
+        }
+
         // Game Events
         EventHandler.register();
         // Client init
diff --git a/src/main/java/thedarkcolour/exdeorum/data/recipe/Recipes.java b/src/main/java/thedarkcolour/exdeorum/data/recipe/Recipes.java
index b914ce89..89cd6a07 100644
--- a/src/main/java/thedarkcolour/exdeorum/data/recipe/Recipes.java
+++ b/src/main/java/thedarkcolour/exdeorum/data/recipe/Recipes.java
@@ -34,6 +34,7 @@ import net.minecraft.world.level.material.Fluids;
 import net.minecraft.world.level.storage.loot.providers.number.ConstantValue;
 import net.minecraft.world.level.storage.loot.providers.number.NumberProvider;
 import net.minecraft.world.level.storage.loot.providers.number.UniformGenerator;
+import net.minecraftforge.common.ForgeMod;
 import net.minecraftforge.common.Tags;
 import net.minecraftforge.common.crafting.conditions.ICondition;
 import net.minecraftforge.common.crafting.conditions.ModLoadedCondition;
@@ -549,6 +550,7 @@ public class Recipes {
         barrelMixing(writer, ingredient(EItems.DUST.get()), Fluids.WATER, Items.CLAY);
         barrelMixing(writer, ingredient(Items.MILK_BUCKET), Fluids.WATER, Items.SLIME_BLOCK);
         barrelMixing(writer, "_from_porcelain_bucket", ingredient(EItems.PORCELAIN_MILK_BUCKET.get()), Fluids.WATER, Items.SLIME_BLOCK);
+        barrelFluidMixing(writer, Fluids.WATER, ForgeMod.MILK.get(), Items.SLIME_BLOCK);
         barrelMixing(writer, ingredient(Items.SNOWBALL), Fluids.WATER, Items.ICE);
         barrelFluidMixing(writer, Fluids.WATER, Fluids.LAVA, Items.STONE);
         // lava